diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 8afb29d89b06..286d7b2f4b1e 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -22,6 +22,9 @@ if (AppConstants.ACCESSIBILITY) { "resource://gre/modules/accessibility/AccessFu.jsm"); } +XPCOMUtils.defineLazyModuleGetter(this, "AsyncPrefs", + "resource://gre/modules/AsyncPrefs.jsm"); + XPCOMUtils.defineLazyModuleGetter(this, "Manifests", "resource://gre/modules/Manifest.jsm"); @@ -529,6 +532,9 @@ var BrowserApp = { InitLater(() => Services.obs.notifyObservers(window, "browser-delayed-startup-finished")); InitLater(() => GlobalEventDispatcher.sendRequest({ type: "Gecko:DelayedStartup" })); + // AsyncPrefs is needed for reader mode. + InitLater(() => AsyncPrefs.init()); + if (!AppConstants.RELEASE_OR_BETA) { InitLater(() => WebcompatReporter.init()); } diff --git a/mobile/android/components/geckoview/GeckoViewPrompt.js b/mobile/android/components/geckoview/GeckoViewPrompt.js index a6ce4c0eb631..eef938501eba 100644 --- a/mobile/android/components/geckoview/GeckoViewPrompt.js +++ b/mobile/android/components/geckoview/GeckoViewPrompt.js @@ -7,9 +7,6 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "AsyncPrefs", - "resource://gre/modules/AsyncPrefs.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "ContentPrefServiceParent", "resource://gre/modules/ContentPrefServiceParent.jsm"); @@ -42,8 +39,6 @@ PromptFactory.prototype = { case "profile-after-change": { // ContentPrefServiceParent is needed for e10s file picker. ContentPrefServiceParent.init(); - // AsyncPrefs is needed for reader mode. - AsyncPrefs.init(); Services.mm.addMessageListener("GeckoView:Prompt", this); break; }