diff options
| author | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-20 07:35:31 -0400 |
|---|---|---|
| committer | Ascrod <32915892+Ascrod@users.noreply.github.com> | 2019-04-20 07:35:31 -0400 |
| commit | a3a34dad182a65500beddac7470c843ce4daebd6 (patch) | |
| tree | c0836ddb727e06561dde68d921d66df72fd9d7f5 /toolkit | |
| parent | 60e2837156c3ce2325782d77784f2a34731ef2f4 (diff) | |
| download | UXP-a3a34dad182a65500beddac7470c843ce4daebd6.tar UXP-a3a34dad182a65500beddac7470c843ce4daebd6.tar.gz UXP-a3a34dad182a65500beddac7470c843ce4daebd6.tar.lz UXP-a3a34dad182a65500beddac7470c843ce4daebd6.tar.xz UXP-a3a34dad182a65500beddac7470c843ce4daebd6.zip | |
Remove browser.search.region usage. Tag #245.
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/search/current/nsSearchService.js | 9 | ||||
| -rw-r--r-- | toolkit/components/urlformatter/nsURLFormatter.js | 9 |
2 files changed, 1 insertions, 17 deletions
diff --git a/toolkit/components/search/current/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js index fd8c9140e..2ea9384f5 100644 --- a/toolkit/components/search/current/nsSearchService.js +++ b/toolkit/components/search/current/nsSearchService.js @@ -3236,14 +3236,7 @@ SearchService.prototype = { // Fallback to building a list based on the regions in the JSON if (!engineNames || !engineNames.length) { - let region; - if (Services.prefs.prefHasUserValue("browser.search.region")) { - region = Services.prefs.getCharPref("browser.search.region"); - } - if (!region || !(region in searchSettings)) { - region = "default"; - } - engineNames = searchSettings[region]["visibleDefaultEngines"]; + engineNames = searchSettings["default"]["visibleDefaultEngines"]; } for (let name of engineNames) { diff --git a/toolkit/components/urlformatter/nsURLFormatter.js b/toolkit/components/urlformatter/nsURLFormatter.js index 970de0537..a4a8e1f47 100644 --- a/toolkit/components/urlformatter/nsURLFormatter.js +++ b/toolkit/components/urlformatter/nsURLFormatter.js @@ -91,15 +91,6 @@ nsURLFormatterService.prototype = { LOCALE: () => Cc["@mozilla.org/chrome/chrome-registry;1"]. getService(Ci.nsIXULChromeRegistry). getSelectedLocale('global'), - REGION: function() { - try { - // When the geoip lookup failed to identify the region, we fallback to - // the 'ZZ' region code to mean 'unknown'. - return Services.prefs.getCharPref("browser.search.region") || "ZZ"; - } catch(e) { - return "ZZ"; - } - }, VENDOR: function() { return this.appInfo.vendor; }, NAME: function() { return this.appInfo.name; }, ID: function() { return this.appInfo.ID; }, |