Replaced nsIGenericWindow with nsIBaseWindow.

git-svn-id: svn://10.0.0.236/trunk@53762 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/docshell/base/nsCDocShell.idl

@@ -24,7 +24,7 @@
 #include "nsIDocShellContainer.idl"
 #include "nsIDocShellEdit.idl"
 #include "nsIDocShellFile.idl"
-#include "nsIGenericWindow.idl"
+#include "nsIBaseWindow.idl"
 #include "nsIScrollable.idl"
 #include "nsITextScroll.idl"
 
@@ -35,7 +35,7 @@ nsIDocShell
 nsIHTMLDocShell
 nsIDocShellEdit
 nsIDocShellFile
-nsIGenericWindow
+nsIBaseWindow
 nsIScrollable
 nsITextScroll
 */

mozilla/docshell/base/nsDocShell.cpp

@@ -106,7 +106,7 @@ NS_IMPL_QUERY_HEAD(nsDocShell)
    NS_IMPL_QUERY_BODY(nsIHTMLDocShell)
    NS_IMPL_QUERY_BODY(nsIDocShellEdit)
    NS_IMPL_QUERY_BODY(nsIDocShellFile)
-   NS_IMPL_QUERY_BODY(nsIGenericWindow)
+   NS_IMPL_QUERY_BODY(nsIBaseWindow)
    NS_IMPL_QUERY_BODY(nsIScrollable)
    NS_IMPL_QUERY_BODY(nsITextScroll)
    NS_IMPL_QUERY_BODY(nsICapabilities)
@@ -782,7 +782,7 @@ NS_IMETHODIMP nsDocShell::FindChildWithName(const PRUnichar *aName, nsIDocShell
 
 
 //*****************************************************************************
-// nsDocShell::nsIGenericWindow
+// nsDocShell::nsIBaseWindow
 //*****************************************************************************   
 
 NS_IMETHODIMP nsDocShell::InitWindow(nativeWindow parentNativeWindow,

mozilla/docshell/base/nsDocShell.h

@@ -62,7 +62,7 @@ class nsDocShell : public nsIDocShell,
                        public nsIDocShellEdit, 
                        public nsIDocShellFile, 
                        public nsIDocShellContainer,
-                       public nsIGenericWindow, 
+                       public nsIBaseWindow, 
                        public nsIScrollable, 
                        public nsITextScroll, 
                        public nsIContentViewerContainer,
@@ -78,7 +78,7 @@ public:
    NS_DECL_NSIDOCSHELLEDIT
    NS_DECL_NSIDOCSHELLFILE
    NS_DECL_NSIDOCSHELLCONTAINER
-   NS_DECL_NSIGENERICWINDOW
+   NS_DECL_NSIBASEWINDOW
    NS_DECL_NSISCROLLABLE
    NS_DECL_NSITEXTSCROLL
    NS_DECL_NSIHTMLDOCSHELL