Bug 775408 - Rename nsIDocShell::SetIsBrowser() to SetIsBrowserElement(). r=jlebar

content/base/src/nsFrameLoader.cpp

@@ -1597,7 +1597,7 @@ nsFrameLoader::MaybeCreateDocShell()
   EnsureMessageManager();
 
   if (OwnerIsBrowserFrame()) {
-    mDocShell->SetIsBrowser();
+    mDocShell->SetIsBrowserElement();
 
     nsCOMPtr<nsIObserverService> os = services::GetObserverService();
     if (os) {

docshell/base/nsDocShell.cpp

@@ -11992,7 +11992,7 @@ nsDocShell::GetCanExecuteScripts(bool *aResult)
 }
 
 NS_IMETHODIMP
-nsDocShell::SetIsBrowser()
+nsDocShell::SetIsBrowserElement()
 {
     if (mIsBrowserFrame) {
         NS_ERROR("You should not call SetIsBrowser() more than once.");

docshell/base/nsIDocShell.idl

@@ -39,7 +39,7 @@ interface nsIWebBrowserPrint;
 interface nsIVariant;
 interface nsIPrivacyTransitionObserver;
 
-[scriptable, builtinclass, uuid(ef5a9aba-fe75-410c-a216-fe9b71a6661c)]
+[scriptable, builtinclass, uuid(be5a675b-b675-4443-af75-510530eab5fa)]
 interface nsIDocShell : nsISupports
 {
   /**
@@ -584,7 +584,7 @@ interface nsIDocShell : nsISupports
    *
    * This method should not be called more than once.
    */
-  void setIsBrowser();
+  void setIsBrowserElement();
 
   /**
    * Returns true iff the docshell is marked as a browser frame.

dom/browser-element/BrowserElementChild.js

@@ -59,7 +59,7 @@ BrowserElementChild.prototype = {
 
     BrowserElementPromptService.mapWindowToBrowserElementChild(content, this);
 
-    docShell.setIsBrowser();
+    docShell.setIsBrowserElement();
     docShell.QueryInterface(Ci.nsIWebProgress)
             .addProgressListener(this._progressListener,
                                  Ci.nsIWebProgress.NOTIFY_LOCATION |

toolkit/components/social/FrameWorker.jsm

@@ -243,7 +243,7 @@ function makeHiddenFrame() {
   // TODO: disable media (bug 759964)
   
   // Mark this docShell as a "browserFrame", to break script access to e.g. window.top
-  docShell.setIsBrowser();
+  docShell.setIsBrowserElement();
 
   return iframe;
 }

toolkit/identity/Sandbox.jsm

@@ -93,7 +93,7 @@ Sandbox.prototype = {
                                       .getInterface(Ci.nsIDocShell);
 
     // Mark this docShell as a "browserFrame", to break script access to e.g. window.top
-    docShell.setIsBrowser();
+    docShell.setIsBrowserElement();
 
     // Stop about:blank from being loaded.
     docShell.stop(Ci.nsIWebNavigation.STOP_NETWORK);