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 249642 c02f3626cfb98fe60cba4170633d96c08bb154e5
parent 249641 df8447ffc4ca2d36f94e6ceb5e3054659bba9adb
child 249643 cece31e1d159f5f370bb6a9c88d5fc05ab79ca70
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret, sylvestre
bugs1117186
milestone37.0a2
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
@@ -251,33 +251,37 @@ pref("browser.search.param.maxSuggestion
 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 (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);
 
 // disable search suggestions by default
 pref("browser.search.suggest.enabled", false);
 pref("browser.search.suggest.prompted", false);
 
 // Tell the search service to load search plugins from the locale JAR
 pref("browser.search.loadFromJars", true);
 pref("browser.search.jarURIs", "chrome://browser/locale/searchplugins/");
 
 // tell the search service that we don't really expose the "current engine"
 pref("browser.search.noCurrentEngine", true);
 
-// disable the search service geoIP check
-pref("browser.search.geoip.url", "");
-
 // Control media casting & mirroring features
 pref("browser.casting.enabled", true);
 pref("browser.mirroring.enabled", true);
 #ifdef RELEASE_BUILD
 // Roku does not yet support mirroring in production
 pref("browser.mirroring.enabled.roku", false);
 #else
 pref("browser.mirroring.enabled.roku", true);
--- 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