Bug 617539 - Fold nsIContentViewer_MOZILLA_2_0_BRANCH, r=sicking

docshell/base/nsIContentViewer.idl

@@ -15,7 +15,7 @@ struct nsIntRect;
 [ptr] native nsIDocumentPtr(nsIDocument);
 [ref] native nsIntRectRef(nsIntRect);
 
-[scriptable, uuid(e2e5dd7d-8140-4fc5-b2c3-3a3b4f946fc7)]
+[scriptable, uuid(75306a89-e3ad-4a2b-9daf-ac4de06661a4)]
 interface nsIContentViewer : nsISupports
 {
 
@@ -133,11 +133,7 @@ interface nsIContentViewer : nsISupports
    * destroyed.  Can return null
    */
   readonly attribute nsISHEntry historyEntry;
-};
 
-[scriptable, uuid(4710ef6e-6de3-47fe-88f4-e49b48c87fc9)]
-interface nsIContentViewer_MOZILLA_2_0_BRANCH : nsISupports
-{
   /*
    * Indicates when we're in a state where content shouldn't be allowed to
    * trigger a tab-modal prompt (as opposed to a window-modal prompt) because

dom/base/nsGlobalWindow.cpp

@@ -2507,9 +2507,7 @@ nsGlobalWindow::GetIsTabModalPromptAllowed()
   if (mDocShell) {
     nsCOMPtr<nsIContentViewer> cv;
     mDocShell->GetContentViewer(getter_AddRefs(cv));
-    nsCOMPtr<nsIContentViewer_MOZILLA_2_0_BRANCH> cv2 = do_QueryInterface(cv);
-    if (cv2)
-      cv2->GetIsTabModalPromptAllowed(&allowTabModal);
+    cv->GetIsTabModalPromptAllowed(&allowTabModal);
   }
 
   return allowTabModal;

layout/base/nsDocumentViewer.cpp

@@ -297,7 +297,6 @@ private:
 
 //-------------------------------------------------------------
 class DocumentViewerImpl : public nsIDocumentViewer,
-                           public nsIContentViewer_MOZILLA_2_0_BRANCH,
                            public nsIContentViewerEdit,
                            public nsIContentViewerFile,
                            public nsIMarkupDocumentViewer_MOZILLA_2_0_BRANCH,
@@ -360,8 +359,6 @@ public:
   // nsIDocumentViewerPrint Printing Methods
   NS_DECL_NSIDOCUMENTVIEWERPRINT
 
-  // nsIContentViewer_MOZILLA_2_0_BRANCH interface...
-  NS_DECL_NSICONTENTVIEWER_MOZILLA_2_0_BRANCH
 protected:
   virtual ~DocumentViewerImpl();
 
@@ -594,7 +591,6 @@ NS_INTERFACE_MAP_BEGIN(DocumentViewerImpl)
 #ifdef NS_PRINTING
     NS_INTERFACE_MAP_ENTRY(nsIWebBrowserPrint)
 #endif
-    NS_INTERFACE_MAP_ENTRY(nsIContentViewer_MOZILLA_2_0_BRANCH)
 NS_INTERFACE_MAP_END
 
 DocumentViewerImpl::~DocumentViewerImpl()