From 985fcbfa2b5c130cc707d54cffe218b6bdb95e5e Mon Sep 17 00:00:00 2001
From: Karandeep <klubana@mozilla.com>
Date: Tue, 1 Aug 2023 11:51:59 +0000
Subject: [PATCH] Bug 1846028 - Add .featureGate pref to clipboard suggestion.
 r=mak

Depends on D184502

Differential Revision: https://phabricator.services.mozilla.com/D184934
---
 browser/app/profile/firefox.js                            | 5 ++++-
 browser/components/urlbar/UrlbarPrefs.sys.mjs             | 5 ++++-
 browser/components/urlbar/UrlbarProviderClipboard.sys.mjs | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e19dc0dddebd9..0dd14c14958f8 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -395,7 +395,7 @@ pref("browser.urlbar.maxHistoricalSearchSuggestions", 2);
 // The default behavior for the urlbar can be configured to use any combination
 // of the match filters with each additional filter adding more results (union).
 pref("browser.urlbar.suggest.bookmark",             true);
-pref("browser.urlbar.suggest.clipboard",            false);
+pref("browser.urlbar.suggest.clipboard",            true);
 pref("browser.urlbar.suggest.history",              true);
 pref("browser.urlbar.suggest.openpage",             true);
 pref("browser.urlbar.suggest.remotetab",            true);
@@ -426,6 +426,9 @@ pref("browser.urlbar.suggest.calculator",           false);
 // Feature gate pref for weather suggestions in the urlbar.
 pref("browser.urlbar.weather.featureGate", false);
 
+// Feature gate pref for clipboard suggestions in the urlbar.
+pref("browser.urlbar.clipboard.featureGate", false);
+
 // When false, the weather suggestion will not be fetched when a VPN is
 // detected. When true, it will be fetched anyway.
 pref("browser.urlbar.weather.ignoreVPN", false);
diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/urlbar/UrlbarPrefs.sys.mjs
index 865f26259525e..cea86a685e2da 100644
--- a/browser/components/urlbar/UrlbarPrefs.sys.mjs
+++ b/browser/components/urlbar/UrlbarPrefs.sys.mjs
@@ -240,7 +240,7 @@ const PREF_URLBAR_DEFAULTS = new Map([
   ["suggest.calculator", false],
 
   // Whether results will include clipboard results.
-  ["suggest.clipboard", false],
+  ["suggest.clipboard", true],
 
   // Whether results will include search engines (e.g. tab-to-search).
   ["suggest.engines", true],
@@ -448,6 +448,9 @@ const PREF_URLBAR_DEFAULTS = new Map([
 
   // Feature gate pref for rich suggestions being shown in the urlbar.
   ["richSuggestions.featureGate", false],
+
+  // Feature gate pref for clipboard suggestions in the urlbar.
+  ["clipboard.featureGate", false],
 ]);
 
 const PREF_OTHER_DEFAULTS = new Map([
diff --git a/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs b/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs
index 7163ac5c2feaf..5ef5c4c6d2f99 100644
--- a/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs
+++ b/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs
@@ -44,6 +44,7 @@ class ProviderClipboard extends UrlbarProvider {
   isActive(queryContext, controller) {
     // Return clipboard results only for empty searches.
     if (
+      !lazy.UrlbarPrefs.get("clipboard.featureGate") ||
       !lazy.UrlbarPrefs.get("suggest.clipboard") ||
       queryContext.searchString
     ) {