From 5ed851623e465378d48e2f8f1627a90968edacbb Mon Sep 17 00:00:00 2001 From: Michael Kaply Date: Mon, 14 May 2018 10:38:20 -0500 Subject: [PATCH] Bug 1461347 - Remove unused enginename from JS, but add to properties. r=nalexander MozReview-Commit-ID: 4KRsXg68mw5 --HG-- extra : rebase_source : 66f30fe798bb589de1f458062447819642586344 --- mobile/android/app/mobile.js | 5 +---- mobile/locales/en-US/chrome/region.properties | 3 +++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 6cde721f3718..b103c78871d1 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -253,8 +253,6 @@ pref("accessibility.browsewithcaret_shortcut.enabled", false); // 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); @@ -268,8 +266,7 @@ pref("browser.search.order.3", "chrome://browser/locale/region.properties"); 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"); diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties index dfa6e9126e59..f887d0804cee 100644 --- a/mobile/locales/en-US/chrome/region.properties +++ b/mobile/locales/en-US/chrome/region.properties @@ -2,6 +2,9 @@ # 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