Bug 1461347 - Remove unused enginename from JS, but add to properties. r=nalexander draft
authorMichael Kaply <mozilla@kaply.com>
Mon, 14 May 2018 10:38:20 -0500
changeset 794869 66f30fe798bb589de1f458062447819642586344
parent 794690 45ec8fd380dd2c308e79dbb396ca87f2ce9b3f9c
child 795033 0d4ec85dfd0071ecf2ca8af009fe01e8f8a6de4f
push id109799
push usermozilla@kaply.com
push dateMon, 14 May 2018 17:44:53 +0000
reviewersnalexander
bugs1461347
milestone62.0a1
Bug 1461347 - Remove unused enginename from JS, but add to properties. r=nalexander MozReview-Commit-ID: 4KRsXg68mw5
mobile/android/app/mobile.js
mobile/locales/en-US/chrome/region.properties
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -248,33 +248,30 @@ pref("accessibility.typeaheadfind.flashB
 pref("accessibility.typeaheadfind.linksonly", false);
 pref("accessibility.typeaheadfind.casesensitive", 0);
 pref("accessibility.browsewithcaret_shortcut.enabled", false);
 
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
 pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
 
-// pointer to the default engine name
-pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties");
 // SSL error page behaviour
 pref("browser.ssl_override_behavior", 2);
 pref("browser.xul.error_pages.expert_bad_cert", false);
 
 // ordering of search engines in the engine list.
 pref("browser.search.order.1", "chrome://browser/locale/region.properties");
 pref("browser.search.order.2", "chrome://browser/locale/region.properties");
 pref("browser.search.order.3", "chrome://browser/locale/region.properties");
 
 // Market-specific search defaults
 pref("browser.search.geoSpecificDefaults", true);
 pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
 
-// US specific default (used as a fallback if the geoSpecificDefaults request fails).
-pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.properties");
+// Allow for unique order in the US.
 pref("browser.search.order.US.1", "chrome://browser/locale/region.properties");
 pref("browser.search.order.US.2", "chrome://browser/locale/region.properties");
 pref("browser.search.order.US.3", "chrome://browser/locale/region.properties");
 
 // disable updating
 pref("browser.search.update", false);
 
 // disable search suggestions by default
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -1,12 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+# This preference is only used to generate browsersearch.json.
+browser.search.defaultenginename=Google
+
 # Search engine order (order displayed in the search bar dropdown).
 browser.search.order.1=Google
 browser.search.order.2=Bing
 
 # These override the equivalents above when the client detects that it is in
 # US market only.
 browser.search.order.US.1=Google
 browser.search.order.US.2=Bing