Commit 1832a08a authored by Dão Gottwald's avatar Dão Gottwald
Browse files

Bug 1827904 - Enable the result menu by default on all channels. r=adw 

Differential Revision: https://phabricator.services.mozilla.com/D175362
parent 35ac6456

browser/app/profile/firefox.js

+0 −12
Original line number Diff line number Diff line
@@ -468,13 +468,9 @@ pref("browser.urlbar.quicksuggest.impressionCaps.nonSponsoredEnabled", false); 
// caps.

pref("browser.urlbar.quicksuggest.impressionCaps.sponsoredEnabled", false);



#ifdef EARLY_BETA_OR_EARLIER

// Whether the usual non-best-match quick suggest results can be blocked. This

// pref is a fallback for the Nimbus variable `quickSuggestBlockingEnabled`.

pref("browser.urlbar.quicksuggest.blockingEnabled", true);

#else

pref("browser.urlbar.quicksuggest.blockingEnabled", false);

#endif



// Whether unit conversion is enabled.

#ifdef NIGHTLY_BUILD
@@ -506,11 +502,7 @@ pref("browser.urlbar.switchTabs.adoptIntoActiveWindow", false); 
pref("browser.urlbar.openintab", false);



// Enable three-dot options button and menu for eligible results.

#ifdef EARLY_BETA_OR_EARLIER

pref("browser.urlbar.resultMenu", true);

#else

pref("browser.urlbar.resultMenu", false);

#endif

// Allow the result menu button to be reached with the Tab key.

pref("browser.urlbar.resultMenu.keyboardAccessible", true);
@@ -589,11 +581,7 @@ pref("browser.urlbar.bestMatch.enabled", false); 


// Whether best match results can be blocked. This pref is a fallback for the

// Nimbus variable `bestMatchBlockingEnabled`.

#ifdef EARLY_BETA_OR_EARLIER

pref("browser.urlbar.bestMatch.blockingEnabled", true);

#else

pref("browser.urlbar.bestMatch.blockingEnabled", false);

#endif



// Enable site specific search result.

pref("browser.urlbar.contextualSearch.enabled", false);

browser/components/urlbar/UrlbarPrefs.sys.mjs

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ 


  // Whether best match results can be blocked. This pref is a fallback for the

  // Nimbus variable `bestMatchBlockingEnabled`.

  ["bestMatch.blockingEnabled", false],

  ["bestMatch.blockingEnabled", true],



  // Whether the best match feature is enabled.

  ["bestMatch.enabled", true],
@@ -272,7 +272,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ 


  // Whether the usual non-best-match quick suggest results can be blocked. This

  // pref is a fallback for the Nimbus variable `quickSuggestBlockingEnabled`.

  ["quicksuggest.blockingEnabled", false],

  ["quicksuggest.blockingEnabled", true],



  // Global toggle for whether the quick suggest feature is enabled, i.e.,

  // sponsored and recommended results related to the user's search string.
@@ -343,7 +343,7 @@ const PREF_URLBAR_DEFAULTS = new Map([ 
  ["quicksuggest.allowPositionInSuggestions", true],



  // Enable three-dot options button and menu for eligible results.

  ["resultMenu", false],

  ["resultMenu", true],



  // Allow the result menu button to be reached with the Tab key.

  ["resultMenu.keyboardAccessible", true],

browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs

+5 −9
Original line number Diff line number Diff line
@@ -270,15 +270,11 @@ class ProviderQuickSuggest extends UrlbarProvider { 
        UrlbarUtils.HIGHLIGHT.SUGGESTED,

      ];

    }

    payload.isBlockable =

      lazy.UrlbarPrefs.get(

    payload.isBlockable = lazy.UrlbarPrefs.get(

      isResultBestMatch

        ? "bestMatchBlockingEnabled"

        : "quickSuggestBlockingEnabled"

      ) ||

      // For Nimbus, we enable blocking when the result menu is enabled. We

      // don't do this in automation so we can test all pref combinations.

      (lazy.UrlbarPrefs.get("resultMenu") && !Cu.isInAutomation);

    );



    let result = new lazy.UrlbarResult(

      UrlbarUtils.RESULT_TYPE.URL,