Backed out changeset a2b294e57559 (bug 1367450) for ESLint failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 01 Jun 2017 10:04:57 -0400
changeset 361820 768208c845b30b551928216939fb16926bd5426a
parent 361819 05affb78c0787d68f21eaa6a6e11f018307b26b5
child 361821 ff5590f1750d53d058b6ab36513a43d979749991
push id31945
push userryanvm@gmail.com
push dateThu, 01 Jun 2017 20:42:17 +0000
treeherdermozilla-central@15e32469eb04 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1367450
milestone55.0a1
backs outa2b294e575591bf3a25065b2c69c4888c4b6b00d
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
Backed out changeset a2b294e57559 (bug 1367450) for ESLint failures.
browser/base/content/browser-captivePortal.js
browser/base/content/browser.js
--- a/browser/base/content/browser-captivePortal.js
+++ b/browser/base/content/browser-captivePortal.js
@@ -58,19 +58,18 @@ var CaptivePortalWatcher = {
       this._captivePortalDetected();
 
       // Automatically open a captive portal tab if there's no other browser window.
       let windows = Services.wm.getEnumerator("navigator:browser");
       if (windows.getNext() == window && !windows.hasMoreElements()) {
         this.ensureCaptivePortalTab();
       }
     }
-    else if (cps.state == cps.UNKNOWN) {
-      cps.recheckCaptivePortal();
-    }
+
+    cps.recheckCaptivePortal();
   },
 
   uninit() {
     Services.obs.removeObserver(this, "captive-portal-login");
     Services.obs.removeObserver(this, "captive-portal-login-abort");
     Services.obs.removeObserver(this, "captive-portal-login-success");
 
 
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1269,16 +1269,17 @@ var gBrowserInit = {
     gPageStyleMenu.init();
     LanguageDetectionListener.init();
     BrowserOnClick.init();
     FeedHandler.init();
     CompactTheme.init();
     AboutPrivateBrowsingListener.init();
     TrackingProtection.init();
     RefreshBlocker.init();
+    CaptivePortalWatcher.init();
     FullZoomUI.init(window);
 
     let mm = window.getGroupMessageManager("browsers");
     mm.loadFrameScript("chrome://browser/content/tab-content.js", true);
     mm.loadFrameScript("chrome://browser/content/content.js", true);
     mm.loadFrameScript("chrome://browser/content/content-UITour.js", true);
     mm.loadFrameScript("chrome://global/content/manifestMessages.js", true);
 
@@ -1711,18 +1712,16 @@ var gBrowserInit = {
     gBrowser.tabContainer.addEventListener("TabSelect", function() {
       for (let panel of document.querySelectorAll("panel[tabspecific='true']")) {
         if (panel.state == "open") {
           panel.hidePopup();
         }
       }
     });
 
-    CaptivePortalWatcher.init();
-
     this.delayedStartupFinished = true;
 
     _resolveDelayedStartup();
     Services.obs.notifyObservers(window, "browser-delayed-startup-finished");
     TelemetryTimestamps.add("delayedStartupFinished");
   },
 
   // Returns the URI(s) to load at startup.