diff --git a/mobile/android/actors/WebBrowserChromeChild.jsm b/mobile/android/actors/WebBrowserChromeChild.jsm index 0c2fd3b78ac8..d908b1fece08 100644 --- a/mobile/android/actors/WebBrowserChromeChild.jsm +++ b/mobile/android/actors/WebBrowserChromeChild.jsm @@ -42,12 +42,6 @@ class WebBrowserChromeChild extends GeckoViewActorChild { ) { debug`shouldLoadURI ${aURI.displaySpec}`; - if (!GeckoViewSettings.useMultiprocess) { - // If we're in non-e10s mode there's no other process we can load this - // page in. - return true; - } - if (!E10SUtils.shouldLoadURI(aDocShell, aURI, aHasPostData)) { E10SUtils.redirectLoad( aDocShell, diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js index 0e33bed8f81e..0cd6e1db7858 100644 --- a/mobile/android/chrome/geckoview/geckoview.js +++ b/mobile/android/chrome/geckoview/geckoview.js @@ -151,7 +151,7 @@ var ModuleManager = { remoteTypeFor(aURI, currentType) { return E10SUtils.getRemoteTypeForURI( aURI, - GeckoViewSettings.useMultiprocess, + /* multiProcess */ true, /* useRemoteSubframes */ false, currentType, this.browser.currentURI @@ -510,17 +510,15 @@ function createBrowser() { browser.setAttribute("flex", "1"); browser.setAttribute("maychangeremoteness", "true"); - if (GeckoViewSettings.useMultiprocess) { - const pointerEventsEnabled = Services.prefs.getBoolPref( - "dom.w3c_pointer_events.multiprocess.android.enabled", - false - ); - if (pointerEventsEnabled) { - Services.prefs.setBoolPref("dom.w3c_pointer_events.enabled", true); - } - browser.setAttribute("remote", "true"); - browser.setAttribute("remoteType", E10SUtils.DEFAULT_REMOTE_TYPE); + const pointerEventsEnabled = Services.prefs.getBoolPref( + "dom.w3c_pointer_events.multiprocess.android.enabled", + false + ); + if (pointerEventsEnabled) { + Services.prefs.setBoolPref("dom.w3c_pointer_events.enabled", true); } + browser.setAttribute("remote", "true"); + browser.setAttribute("remoteType", E10SUtils.DEFAULT_REMOTE_TYPE); return browser; } diff --git a/mobile/android/modules/geckoview/GeckoViewSettings.jsm b/mobile/android/modules/geckoview/GeckoViewSettings.jsm index 01c5394a9302..8c01aa9d151e 100644 --- a/mobile/android/modules/geckoview/GeckoViewSettings.jsm +++ b/mobile/android/modules/geckoview/GeckoViewSettings.jsm @@ -48,10 +48,6 @@ const DISPLAY_MODE_FULLSCREEN = 3; // Handles GeckoSession settings. class GeckoViewSettings extends GeckoViewModule { - static get useMultiprocess() { - return Services.prefs.getBoolPref("browser.tabs.remote.autostart", true); - } - onInit() { debug`onInit`; this._userAgentMode = USER_AGENT_MODE_MOBILE;