mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
Bug 1117158: move search service prefs to all.js, r=markh/margaret/fabrice
--HG-- extra : rebase_source : 5b3380dd9a0dc695c44a2d7d85e8217d8fb2119a
This commit is contained in:
parent
25ad02d5cb
commit
9cd3807a46
@ -161,16 +161,8 @@ pref("accessibility.typeaheadfind.casesensitive", 0);
|
||||
pref("browser.ssl_override_behavior", 2);
|
||||
pref("browser.xul.error_pages.expert_bad_cert", false);
|
||||
|
||||
// disable logging for the search service by default
|
||||
pref("browser.search.log", false);
|
||||
|
||||
// disable updating
|
||||
pref("browser.search.update", false);
|
||||
pref("browser.search.update.log", false);
|
||||
pref("browser.search.updateinterval", 6);
|
||||
|
||||
// enable search suggestions by default
|
||||
pref("browser.search.suggest.enabled", true);
|
||||
|
||||
// tell the search service that we don't really expose the "current engine"
|
||||
pref("browser.search.noCurrentEngine", true);
|
||||
|
@ -396,9 +396,6 @@ pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE
|
||||
// pointer to the default engine name
|
||||
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
|
||||
|
||||
// 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-region/locale/region.properties");
|
||||
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
|
||||
@ -417,34 +414,11 @@ pref("browser.search.openintab", false);
|
||||
// context menu searches open in the foreground
|
||||
pref("browser.search.context.loadInBackground", false);
|
||||
|
||||
// send ping to the server to update
|
||||
pref("browser.search.update", true);
|
||||
|
||||
// disable logging for the search service update system by default
|
||||
pref("browser.search.update.log", false);
|
||||
|
||||
// Check whether we need to perform engine updates every 6 hours
|
||||
pref("browser.search.update.interval", 21600);
|
||||
|
||||
// enable search suggestions by default
|
||||
pref("browser.search.suggest.enabled", true);
|
||||
|
||||
pref("browser.search.showOneOffButtons", true);
|
||||
|
||||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
// {moz:official} expands to "official"
|
||||
pref("browser.search.official", true);
|
||||
#endif
|
||||
|
||||
// How many times to show the new search highlight
|
||||
pref("browser.search.highlightCount", 5);
|
||||
|
||||
// geoip end-point and timeout
|
||||
pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%");
|
||||
// NOTE: this timeout figure is also the "high" value for the telemetry probe
|
||||
// SEARCH_SERVICE_COUNTRY_FETCH_MS - if you change this also change that probe.
|
||||
pref("browser.search.geoip.timeout", 2000);
|
||||
|
||||
pref("browser.sessionhistory.max_entries", 50);
|
||||
|
||||
// handle links targeting new windows
|
||||
|
@ -251,9 +251,6 @@ pref("browser.search.param.maxSuggestions", "4");
|
||||
pref("browser.ssl_override_behavior", 2);
|
||||
pref("browser.xul.error_pages.expert_bad_cert", false);
|
||||
|
||||
// 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");
|
||||
@ -261,8 +258,6 @@ pref("browser.search.order.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);
|
||||
@ -275,10 +270,8 @@ 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);
|
||||
|
||||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
// {moz:official} expands to "official"
|
||||
pref("browser.search.official", true);
|
||||
#endif
|
||||
// disable the search service geoIP check
|
||||
pref("browser.search.geoip.url", "");
|
||||
|
||||
// Control media casting & mirroring features
|
||||
pref("browser.casting.enabled", true);
|
||||
|
@ -4438,3 +4438,20 @@ pref("dom.mozSettings.SettingsService.verbose.enabled", false);
|
||||
// IndexedDB transactions to be opened as readonly or keep everything as
|
||||
// readwrite.
|
||||
pref("dom.mozSettings.allowForceReadOnly", false);
|
||||
|
||||
// Search service settings
|
||||
pref("browser.search.log", false);
|
||||
pref("browser.search.update", true);
|
||||
pref("browser.search.update.log", false);
|
||||
pref("browser.search.update.interval", 21600);
|
||||
pref("browser.search.suggest.enabled", true);
|
||||
pref("browser.search.geoSpecificDefaults", false);
|
||||
pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=%MOZILLA_API_KEY%");
|
||||
// NOTE: this timeout figure is also the "high" value for the telemetry probe
|
||||
// SEARCH_SERVICE_COUNTRY_FETCH_MS - if you change this also change that probe.
|
||||
pref("browser.search.geoip.timeout", 2000);
|
||||
|
||||
#ifdef MOZ_OFFICIAL_BRANDING
|
||||
// {moz:official} expands to "official"
|
||||
pref("browser.search.official", true);
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user