diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-19 17:41:09 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-20 07:29:59 -0400 |
| commit | c78cd6fb9768c7f2c31e01d02935feca8e239637 (patch) | |
| tree | bfdb7f91361fb781b745e630162292acb9d69de3 | |
| parent | e0116ac2b78eb4e621a4d0769e01f8358a6d661c (diff) | |
| download | UXP-c78cd6fb9768c7f2c31e01d02935feca8e239637.tar UXP-c78cd6fb9768c7f2c31e01d02935feca8e239637.tar.gz UXP-c78cd6fb9768c7f2c31e01d02935feca8e239637.tar.lz UXP-c78cd6fb9768c7f2c31e01d02935feca8e239637.tar.xz UXP-c78cd6fb9768c7f2c31e01d02935feca8e239637.zip | |
Remove geo-specific search engine default preferences. Tag #245.
| -rw-r--r-- | application/basilisk/app/profile/basilisk.js | 12 | ||||
| -rw-r--r-- | modules/libpref/init/all.js | 3 |
2 files changed, 0 insertions, 15 deletions
diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js index fc3b4546b..c7b2852dd 100644 --- a/application/basilisk/app/profile/basilisk.js +++ b/application/basilisk/app/profile/basilisk.js @@ -346,18 +346,6 @@ pref("browser.search.order.1", "chrome://browser-region/locale/re pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); -// Market-specific search defaults -// This is disabled globally, and then enabled for individual locales -// in firefox-l10n.js (eg. it's enabled for en-US). -pref("browser.search.geoSpecificDefaults", false); -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", "data:text/plain,browser.search.defaultenginename.US=Google"); -pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=Google"); -pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Yahoo"); -pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=Bing"); - // search bar results always open in a new tab pref("browser.search.openintab", false); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 10f9b994a..56dbba31e 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -5233,9 +5233,6 @@ pref("browser.search.update.interval", 21600); pref("browser.search.suggest.enabled", true); pref("browser.search.reset.enabled", false); pref("browser.search.reset.whitelist", ""); -pref("browser.search.geoSpecificDefaults", false); -pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%"); -pref("browser.search.geoip.timeout", 3000); #ifdef MOZ_OFFICIAL_BRANDING // {moz:official} expands to "official" |