diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js index baa514c5c0ed..b53db31ebbf3 100644 --- a/toolkit/content/browser-child.js +++ b/toolkit/content/browser-child.js @@ -282,10 +282,6 @@ addEventListener("TextZoomChange", function (aEvent) { RemoteAddonsChild.init(this); -addMessageListener("History:UseGlobalHistory", function (aMessage) { - docShell.useGlobalHistory = aMessage.data.enabled; -}); - addMessageListener("NetworkPrioritizer:AdjustPriority", (msg) => { let webNav = docShell.QueryInterface(Ci.nsIWebNavigation); let loadGroup = webNav.QueryInterface(Ci.nsIDocumentLoader) @@ -352,6 +348,8 @@ let AutoCompletePopup = { } } -addMessageListener("FormAutoComplete:InitPopup", function (aMessage) { +let [initData] = sendSyncMessage("Browser:Init"); +docShell.useGlobalHistory = initData.useGlobalHistory; +if (initData.initPopup) { setTimeout(function() AutoCompletePopup.init(), 0); -}); +} diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml index 83e2c514b78d..a0df570b3c63 100644 --- a/toolkit/content/widgets/remote-browser.xml +++ b/toolkit/content/widgets/remote-browser.xml @@ -181,10 +181,16 @@ element may not be initialized yet. + */ + let jsm = "resource://gre/modules/RemoteWebNavigation.jsm"; let RemoteWebNavigation = Cu.import(jsm, {}).RemoteWebNavigation; this._remoteWebNavigation = new RemoteWebNavigation(this); + this.messageManager.addMessageListener("Browser:Init", this); this.messageManager.addMessageListener("DOMTitleChanged", this); this.messageManager.addMessageListener("ImageDocumentLoaded", this); this.messageManager.addMessageListener("SetSyncHandler", this); @@ -207,14 +213,6 @@ jsm = "resource://gre/modules/RemoteAddonsParent.jsm"; let RemoteAddonsParent = Components.utils.import(jsm, {}).RemoteAddonsParent; RemoteAddonsParent.init(); - - if (!this.hasAttribute("disableglobalhistory")) { - this.messageManager.sendAsyncMessage("History:UseGlobalHistory", {enabled:true}); - } - - if (this.autoCompletePopup) { - this.messageManager.sendAsyncMessage("FormAutoComplete:InitPopup"); - } ]]> @@ -223,6 +221,12 @@