Bug 1391337 - Do not initialize gSync in nonBrowserWindowDelayedStartup. r?markh
MozReview-Commit-ID: H5ahbcFZnFX
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -85,18 +85,17 @@ var gSync = {
// we open the window. We can avoid a repaint.
if (state.status != UIState.STATUS_NOT_CONFIGURED) {
this.updateAllUI(state);
}
}
},
init() {
- // Bail out if we're already initialized or for hidden windows.
- if (this._initialized || window.location.href != getBrowserURL()) {
+ if (this._initialized) {
return;
}
for (let topic of this._obs) {
Services.obs.addObserver(this, topic, true);
}
this._generateNodeGetters();
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -1944,21 +1944,16 @@ if (AppConstants.platform == "macosx") {
this._delayedStartupTimeoutId = null;
// initialise the offline listener
BrowserOffline.init();
// initialize the private browsing UI
gPrivateBrowsingUI.init();
- // initialize the sync UI
- requestIdleCallback(() => {
- gSync.init();
- }, {timeout: 1000 * 5});
-
if (AppConstants.E10S_TESTING_ONLY) {
gRemoteTabsUI.init();
}
};
gBrowserInit.nonBrowserWindowShutdown = function() {
let dockSupport = Cc["@mozilla.org/widget/macdocksupport;1"]
.getService(Ci.nsIMacDockSupport);