Remove no longer used method. Bug 327098, r+sr=jst

This commit is contained in:
bzbarsky%mit.edu 2006-02-23 03:24:33 +00:00
Родитель 7e74a76712
Коммит 07113309f9
3 изменённых файлов: 9 добавлений и 23 удалений

Просмотреть файл

@ -63,21 +63,14 @@ enum PopupControlState {
openOverridden // disallow window open
};
// permissible values for GetOpenAllow
enum OpenAllowValue {
allowNot = 0, // the window opening is denied
allowNoAbuse, // allowed: not a popup
allowWhitelisted // allowed: it's whitelisted or popup blocking is disabled
};
class nsIDocShell;
class nsIFocusController;
class nsIDocument;
struct nsTimeout;
#define NS_PIDOMWINDOW_IID \
{ 0x71201bf6, 0x0b49, 0x4b92, \
{ 0xa3, 0x62, 0x00, 0x79, 0xb1, 0x9c, 0xc3, 0xa2 } }
{ 0xb14e8b8b, 0x1ee2, 0x43a6, \
{ 0xa5, 0x4a, 0x56, 0xa1, 0x88, 0xaa, 0x09, 0x98 } }
class nsPIDOMWindow : public nsIDOMWindowInternal
{
@ -258,12 +251,6 @@ public:
virtual void PopPopupControlState(PopupControlState state) const = 0;
virtual PopupControlState GetPopupControlState() const = 0;
// GetOpenAllow must not be called on a window that no longer has a docshell
// This function is deprecated. It will assume that there is no existing
// window with name aName for purposes of its answer. Expect this function
// to get removed soon!
virtual OpenAllowValue GetOpenAllow(const nsAString &aName) = 0;
// Returns an object containing the window's state. This also suspends
// all running timeouts in the window.
virtual nsresult SaveWindowState(nsISupports **aState) = 0;

Просмотреть файл

@ -4101,13 +4101,6 @@ nsGlobalWindow::CheckOpenAllow(PopupControlState aAbuseLevel)
return allowWindow;
}
OpenAllowValue
nsGlobalWindow::GetOpenAllow(const nsAString &aName)
{
NS_ENSURE_TRUE(GetDocShell(), allowNot);
return CheckOpenAllow(CheckForAbusePoint());
}
/* If a window open is blocked, fire the appropriate DOM events.
aBlocked signifies we just blocked a popup.
aWindow signifies we just opened what is probably a popup.

Просмотреть файл

@ -111,6 +111,13 @@ class nsHistory;
class nsIDocShellLoadInfo;
class WindowStateHolder;
// permissible values for CheckOpenAllow
enum OpenAllowValue {
allowNot = 0, // the window opening is denied
allowNoAbuse, // allowed: not a popup
allowWhitelisted // allowed: it's whitelisted or popup blocking is disabled
};
//*****************************************************************************
// nsGlobalWindow: Global Object for Scripting
//*****************************************************************************
@ -212,7 +219,6 @@ public:
virtual NS_HIDDEN_(PopupControlState) PushPopupControlState(PopupControlState state, PRBool aForce) const;
virtual NS_HIDDEN_(void) PopPopupControlState(PopupControlState state) const;
virtual NS_HIDDEN_(PopupControlState) GetPopupControlState() const;
virtual NS_HIDDEN_(OpenAllowValue) GetOpenAllow(const nsAString &aName);
virtual NS_HIDDEN_(nsresult) SaveWindowState(nsISupports **aState);
virtual NS_HIDDEN_(nsresult) RestoreWindowState(nsISupports *aState);