Bug 1111275 - Replace gBrowser.mCurrentBrowser with gBrowser.selectedBrowser. r=dao
authorThejdeep <tejdeepg@gmail.com>
Mon, 15 Dec 2014 22:07:18 +0100
changeset 219910 cf9718aa24bcaf9d01561ddfda3bb29c447698c7
parent 219909 1439cb361d99fa1d58b7164018177213656a0090
child 219911 012389891b5241ad9a54ec66ec2a62d3a8ef559b
push id52946
push usercbook@mozilla.com
push dateTue, 16 Dec 2014 12:43:15 +0000
treeherdermozilla-inbound@df8db207bf66 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1111275
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1111275 - Replace gBrowser.mCurrentBrowser with gBrowser.selectedBrowser. r=dao
browser/base/content/browser.js
browser/base/content/urlbarBindings.xml
browser/components/search/content/search.xml
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -931,17 +931,17 @@ var gBrowserInit = {
       new nsBrowserAccess();
 
     if (!gMultiProcessBrowser) {
       // There is a Content:Click message manually sent from content.
       Cc["@mozilla.org/eventlistenerservice;1"]
         .getService(Ci.nsIEventListenerService)
         .addSystemEventListener(gBrowser, "click", contentAreaClick, true);
     } else {
-      gBrowser.updateBrowserRemoteness(gBrowser.mCurrentBrowser, true);
+      gBrowser.updateBrowserRemoteness(gBrowser.selectedBrowser, true);
     }
 
     // hook up UI through progress listener
     gBrowser.addProgressListener(window.XULBrowserWindow);
     gBrowser.addTabsProgressListener(window.TabsProgressListener);
 
     // setup simple gestures support
     gGestureSupport.init(true);
--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -1053,17 +1053,17 @@
         let addEngineList =
           document.getAnonymousElementByAttribute(this, "anonid", "add-engines");
         while (addEngineList.firstChild)
           addEngineList.firstChild.remove();
 
         const kXULNS =
           "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-        let addEngines = gBrowser.mCurrentBrowser.engines;
+        let addEngines = gBrowser.selectedBrowser.engines;
         if (addEngines && addEngines.length > 0) {
           const kBundleURI = "chrome://browser/locale/search.properties";
           let bundle = Services.strings.createBundle(kBundleURI);
           for (let engine of addEngines) {
             let button = document.createElementNS(kXULNS, "button");
             let label = bundle.formatStringFromName("cmd_addFoundEngine",
                                                     [engine.title], 1);
             button.setAttribute("class", "addengine-item");
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -344,17 +344,17 @@
           // indexes as items are removed.
           var items = popup.childNodes;
           for (var i = items.length - 1; i >= 0; i--) {
             if (items[i].classList.contains("addengine-item") ||
                 items[i].classList.contains("addengine-separator"))
               popup.removeChild(items[i]);
           }
 
-          var addengines = gBrowser.mCurrentBrowser.engines;
+          var addengines = gBrowser.selectedBrowser.engines;
           if (addengines && addengines.length > 0) {
             const kXULNS =
                "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
             // Find the (first) separator in the remaining menu, or the first item
             // if no separators are present.
             var insertLocation = popup.firstChild;
             while (insertLocation.nextSibling &&