Bug 1609699 - Rename browser.urlbar.searchTips pref to browser.urlbar.update1.searchTips. r=mak

Differential Revision: https://phabricator.services.mozilla.com/D60152

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Harry Twyford 2020-01-17 16:07:21 +00:00
parent 6fa2d9bf6c
commit b7040f1383
4 changed files with 10 additions and 10 deletions

View File

@ -305,10 +305,6 @@ pref("browser.urlbar.oneOffSearches", true);
// human readable (percent-decoded) URL on the clipboard.
pref("browser.urlbar.decodeURLsOnCopy", false);
// If true, we show new users and those about to start an organic search a tip
// encouraging them to use the Urlbar.
pref("browser.urlbar.searchTips", false);
// Whether or not to move tabs into the active window when using the "Switch to
// Tab" feature of the awesomebar.
pref("browser.urlbar.switchTabs.adoptIntoActiveWindow", false);
@ -336,6 +332,10 @@ pref("browser.urlbar.usepreloadedtopurls.expire_days", 14);
// focused in design update 1.
pref("browser.urlbar.update1.expandTextOnFocus", false);
// If true, we show new users and those about to start an organic search a tip
// encouraging them to use the Urlbar.
pref("browser.urlbar.update1.searchTips", false);
pref("browser.urlbar.eventTelemetry.enabled", false);
pref("browser.altClickSave", false);

View File

@ -118,10 +118,6 @@ const PREF_URLBAR_DEFAULTS = new Map([
// results.
["restyleSearches", false],
// If true, we show new users and those about to start an organic search a tip
// encouraging them to use the Urlbar.
["searchTips", false],
// The number of times the user has been shown a search tip.
["searchTips.shownCount", 0],
@ -160,6 +156,10 @@ const PREF_URLBAR_DEFAULTS = new Map([
// If true, we strip https:// instead of http:// from URLs in the results view.
["update1.view.stripHttps", false],
// If true, we show new users and those about to start an organic search a tip
// encouraging them to use the Urlbar.
["update1.searchTips", false],
// Whether the urlbar displays a permanent search button in design update 2.
["update2.searchButton", false],
]);

View File

@ -118,7 +118,7 @@ class ProviderSearchTips extends UrlbarProvider {
* @returns {boolean} Whether this provider should be invoked for the search.
*/
isActive(queryContext) {
return UrlbarPrefs.get("searchTips") && this.currentTip;
return UrlbarPrefs.get("update1.searchTips") && this.currentTip;
}
/**

View File

@ -44,7 +44,7 @@ add_task(async function init() {
await SpecialPowers.pushPrefEnv({
set: [
["browser.urlbar.searchTips", true],
["browser.urlbar.update1.searchTips", true],
["browser.urlbar.searchTips.shownCount", 0],
// We must disable our Top Sites behaviour for this test until we find a
// way for multiple restricting providers to work together.