From 49cad2a3ea997d0d3bad66cc07f3c24b5d0dc3d7 Mon Sep 17 00:00:00 2001 From: Harry Twyford Date: Wed, 27 Nov 2019 16:38:47 +0000 Subject: [PATCH] Bug 1599785 - Hide and rename Urlbar searchButton pref. r=mak Differential Revision: https://phabricator.services.mozilla.com/D54961 --HG-- extra : moz-landing-system : lando --- browser/app/profile/firefox.js | 2 -- browser/components/urlbar/UrlbarInput.jsm | 2 +- browser/components/urlbar/UrlbarPrefs.jsm | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 7e423a3d4c26..1b0dc3317e0e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -329,8 +329,6 @@ pref("browser.urlbar.update1", false); // Whether we expand the font size when when the urlbar is // focused in design update 1. pref("browser.urlbar.update1.expandTextOnFocus", false); -// Whether the urlbar displays a permanent search button in design update 1. -pref("browser.urlbar.update1.searchButton", false); // Whether the urlbar should strip https from urls in the view. pref("browser.urlbar.update1.view.stripHttps", false); diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index f9d5a8deda8c..c5970b1e5907 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -87,7 +87,7 @@ class UrlbarInput { if (this.megabar) { this.textbox.classList.add("megabar"); this.textbox.parentNode.classList.add("megabar"); - this.searchButton = UrlbarPrefs.get("update1.searchButton"); + this.searchButton = UrlbarPrefs.get("update2.searchButton"); if (this.searchButton) { this.textbox.classList.add("searchButton"); } diff --git a/browser/components/urlbar/UrlbarPrefs.jsm b/browser/components/urlbar/UrlbarPrefs.jsm index c813f2d090c0..60295376c0e1 100644 --- a/browser/components/urlbar/UrlbarPrefs.jsm +++ b/browser/components/urlbar/UrlbarPrefs.jsm @@ -150,11 +150,11 @@ const PREF_URLBAR_DEFAULTS = new Map([ // Whether the quantum bar displays design update 1. ["update1", false], - // Whether the urlbar displays a permanent search button in design update 1. - ["update1.searchButton", false], - // If true, we strip https:// instead of http:// from URLs in the results view. ["update1.view.stripHttps", false], + + // Whether the urlbar displays a permanent search button in design update 2. + ["update2.searchButton", false], ]); const PREF_OTHER_DEFAULTS = new Map([ ["keyword.enabled", true],