wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1117186 - fix geo-specific search default perferences r=margaret

Browse Source
This commit is contained in:
Mark Finkle 2015-01-29 15:19:49 -05:00
parent 1636268bdc
commit 48771835dd
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/android/app/mobile.js
View File

@ -257,6 +257,13 @@ 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);
@ -271,9 +278,6 @@ 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);

17
mobile/locales/en-US/chrome/region.properties
View File

@ -3,12 +3,19 @@
# 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)s
browser.search.order.1=Yahoo
browser.search.order.2=Bing
browser.search.order.3=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
# 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