Bug 1274633 - remove windows 10 welcome page, r?MattN
MozReview-Commit-ID: HI8mqzRmV45
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -374,19 +374,16 @@ pref("browser.search.openintab", false);
// context menu searches open in the foreground
pref("browser.search.context.loadInBackground", false);
// comma seperated list of of engines to hide in the search panel.
pref("browser.search.hiddenOneOffs", "");
pref("browser.search.reset.enabled", true);
-pref("browser.usedOnWindows10", false);
-pref("browser.usedOnWindows10.introURL", "https://www.mozilla.org/%LOCALE%/firefox/windows-10/welcome/?utm_source=firefox-browser&utm_medium=firefox-browser");
-
pref("browser.sessionhistory.max_entries", 50);
// Built-in default permissions.
pref("permissions.manager.defaultsUrl", "resource://app/defaults/permissions");
// handle links targeting new windows
// 1=current window/tab, 2=new window, 3=new tab in most recent window
pref("browser.link.open_newwindow", 3);
--- a/browser/components/migration/FirefoxProfileMigrator.js
+++ b/browser/components/migration/FirefoxProfileMigrator.js
@@ -152,21 +152,16 @@ FirefoxProfileMigrator.prototype._getRes
let buildID = Services.appinfo.platformBuildID;
let mstone = Services.appinfo.platformVersion;
// Force the browser to one-off resume the session that we give it:
Services.prefs.setBoolPref("browser.sessionstore.resume_session_once", true);
// Reset the homepage_override prefs so that the browser doesn't override our
// session with the "what's new" page:
Services.prefs.setCharPref("browser.startup.homepage_override.mstone", mstone);
Services.prefs.setCharPref("browser.startup.homepage_override.buildID", buildID);
- // Also set the Windows 10 pref to avoid the win10 intro page to show up
- // on startup.
- if (AppConstants.isPlatformAndVersionAtLeast("win", "10")) {
- Services.prefs.setBoolPref("browser.usedOnWindows10", true);
- }
// It's too early in startup for the pref service to have a profile directory,
// so we have to manually tell it where to save the prefs file.
let newPrefsFile = currentProfileDir.clone();
newPrefsFile.append("prefs.js");
Services.prefs.savePrefFile(newPrefsFile);
aCallback(true);
}, function() {
aCallback(false);
--- a/browser/components/nsBrowserContentHandler.js
+++ b/browser/components/nsBrowserContentHandler.js
@@ -520,32 +520,16 @@ nsBrowserContentHandler.prototype = {
}
}
} catch (ex) {}
// formatURLPref might return "about:blank" if getting the pref fails
if (overridePage == "about:blank")
overridePage = "";
- // Temporary override page for users who are running Firefox on Windows 10 for their first time.
- let platformVersion = Services.sysinfo.getProperty("version");
- if (AppConstants.platform == "win" &&
- Services.vc.compare(platformVersion, "10") == 0 &&
- !Services.prefs.getBoolPref("browser.usedOnWindows10")) {
- Services.prefs.setBoolPref("browser.usedOnWindows10", true);
- let firstUseOnWindows10URL = Services.urlFormatter.formatURLPref("browser.usedOnWindows10.introURL");
-
- if (firstUseOnWindows10URL && firstUseOnWindows10URL.length) {
- additionalPage = firstUseOnWindows10URL;
- if (override == OVERRIDE_NEW_PROFILE) {
- additionalPage += "&utm_content=firstrun";
- }
- }
- }
-
if (!additionalPage) {
additionalPage = LaterRun.getURL() || "";
}
if (additionalPage && additionalPage != "about:blank") {
if (overridePage) {
overridePage += "|" + additionalPage;
} else {
--- a/layout/tools/reftest/reftest-preferences.js
+++ b/layout/tools/reftest/reftest-preferences.js
@@ -102,17 +102,16 @@ user_pref("xpinstall.signatures.required
// Don't use auto-enabled e10s
user_pref("browser.tabs.remote.autostart.1", false);
user_pref("browser.tabs.remote.autostart.2", false);
user_pref("startup.homepage_welcome_url", "");
user_pref("startup.homepage_welcome_url.additional", "");
user_pref("startup.homepage_override_url", "");
-user_pref("browser.usedOnWindows10.introURL", "");
user_pref("media.gmp-manager.url.override", "http://localhost/dummy-gmp-manager.xml");
// A fake bool pref for "@supports -moz-bool-pref" sanify test.
user_pref("testing.supports.moz-bool-pref", true);
// Reftests load a lot of URLs very quickly. This puts avoidable and
// unnecessary I/O pressure on the Places DB (measured to be in the
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -309,17 +309,16 @@ class DesktopInstance(GeckoInstance):
'browser.safebrowsing.forbiddenURIs.enabled': False,
'browser.safebrowsing.malware.enabled': False,
'browser.safebrowsing.phishing.enabled': False,
'browser.search.update': False,
'browser.tabs.animate': False,
'browser.tabs.warnOnClose': False,
'browser.tabs.warnOnOpen': False,
'browser.uitour.enabled': False,
- 'browser.usedOnWindows10.introURL': '',
'extensions.getAddons.cache.enabled': False,
'extensions.installDistroAddons': False,
'extensions.showMismatchUI': False,
'extensions.update.enabled': False,
'extensions.update.notifyUser': False,
'geo.provider.testing': True,
'javascript.options.showInConsole': True,
'privacy.trackingprotection.enabled': False,
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -346,9 +346,8 @@ user_pref("browser.urlbar.suggest.search
// tests that don't expect it to be there.
user_pref("browser.urlbar.userMadeSearchSuggestionsChoice", true);
user_pref("dom.audiochannel.mutedByDefault", false);
user_pref("webextensions.tests", true);
user_pref("startup.homepage_welcome_url", "about:blank");
user_pref("startup.homepage_welcome_url.additional", "");
-user_pref("browser.usedOnWindows10.introURL", "");