From 07113309f9546d518d481b28641020046e25ba43 Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Thu, 23 Feb 2006 03:24:33 +0000
Subject: [PATCH] Remove no longer used method.  Bug 327098, r+sr=jst

---
 dom/public/base/nsPIDOMWindow.h | 17 ++---------------
 dom/src/base/nsGlobalWindow.cpp |  7 -------
 dom/src/base/nsGlobalWindow.h   |  8 +++++++-
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/dom/public/base/nsPIDOMWindow.h b/dom/public/base/nsPIDOMWindow.h
index 4999551c36b7..e684da2d127b 100644
--- a/dom/public/base/nsPIDOMWindow.h
+++ b/dom/public/base/nsPIDOMWindow.h
@@ -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;
diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp
index 1e3bc3aee5a0..1ff1e1a2bc14 100644
--- a/dom/src/base/nsGlobalWindow.cpp
+++ b/dom/src/base/nsGlobalWindow.cpp
@@ -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.
diff --git a/dom/src/base/nsGlobalWindow.h b/dom/src/base/nsGlobalWindow.h
index f586f4c963ae..993dd3b70ef4 100644
--- a/dom/src/base/nsGlobalWindow.h
+++ b/dom/src/base/nsGlobalWindow.h
@@ -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);