Bug 1117186 - fix geo-specific search default perferences r=margaret a=sylvestre l10n=aware
authorMark Finkle <mfinkle@mozilla.com>
Thu, 29 Jan 2015 15:19:49 -0500
changeset 243724 e1faea5d0942
parent 243723 c1578e681849
child 243725 923404bb30ac
push id4451
push usermfinkle@mozilla.com
push date2015-02-09 17:23 +0000
treeherdermozilla-beta@e1faea5d0942 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret, sylvestre
bugs1117186
milestone36.0
Bug 1117186 - fix geo-specific search default perferences r=margaret a=sylvestre l10n=aware
mobile/android/app/mobile.js
mobile/locales/en-US/chrome/region.properties
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -253,16 +253,23 @@ pref("browser.xul.error_pages.expert_bad
 // disable logging for the search service by default
 pref("browser.search.log", 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 (US market only)
+pref("browser.search.geoSpecificDefaults", true);
+pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.properties");
+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);
 pref("browser.search.update.log", false);
 pref("browser.search.updateinterval", 6);
 
 // disable search suggestions by default
 pref("browser.search.suggest.enabled", false);
 pref("browser.search.suggest.prompted", false);
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -1,19 +1,26 @@
 # 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/.
 
 # Default search engine
-browser.search.defaultenginename=Yahoo
+browser.search.defaultenginename=Google
+
+# Search engine order (order displayed in the search bar dropdown).
+browser.search.order.1=Google
+browser.search.order.2=Yahoo
+browser.search.order.3=Bing
 
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Yahoo
-browser.search.order.2=Bing
-browser.search.order.3=Google
+# These override the equivalents above when the client detects that it is in
+# US market only.
+browser.search.defaultenginename.US=Yahoo
+browser.search.order.US.1=Yahoo
+browser.search.order.US.2=Google
+browser.search.order.US.3=Bing
 
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so
 # don't make any spelling errors here.
 gecko.handlerService.defaultHandlersVersion=3