Merge pull request #1223 from laniakea64/recommend-prefs-cleanup

[current] Cleanup prefs for "Recommend (extensions/features) as you browse"
BrowserWorks · Nov 14, 2019 · 80ed8ea · 80ed8ea
2 parents 6960b8a + 8d01e58
commit 80ed8ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 34 deletions.
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -1320,6 +1320,8 @@ pref("browser.newtabpage.activity-stream.improvesearch.topSiteSearchShortcuts",
 // ASRouter provider configuration
 pref("browser.newtabpage.activity-stream.asrouter.providers.cfr", "{\"id\":\"cfr\",\"enabled\":false,\"type\":\"local\",\"localProvider\":\"CFRMessageProvider\",\"frequency\":{\"custom\":[{\"period\":\"daily\",\"cap\":1}]},\"categories\":[\"cfrAddons\",\"cfrFeatures\"]}", locked);
 pref("browser.newtabpage.activity-stream.asrouter.providers.snippets", "[]", locked);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons", false, locked);
+pref("browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features", false, locked);
 
 // The pref controls if search hand-off is enabled for Activity Stream.
 #ifdef NIGHTLY_BUILD

diff --git a/browser/components/newtab/lib/ActivityStream.jsm b/browser/components/newtab/lib/ActivityStream.jsm
@@ -187,11 +187,11 @@ const PREFS_CONFIG = new Map([
   }],
   ["asrouter.userprefs.cfr.addons", {
     title: "Does the user allow CFR addon recommendations?",
-    value: true,
+    value: false,
   }],
   ["asrouter.userprefs.cfr.features", {
     title: "Does the user allow CFR feature recommendations?",
-    value: true,
+    value: false,
   }],
   ["asrouter.providers.onboarding", {
     title: "Configuration for onboarding provider",

diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
@@ -136,16 +136,6 @@ Preferences.addAll([
   { id: "browser.sessionstore.restore_on_demand", type: "bool" },
   { id: "browser.ctrlTab.recentlyUsedOrder", type: "bool" },
 
-  // CFR
-  {
-    id: "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons",
-    type: "bool",
-  },
-  {
-    id: "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features",
-    type: "bool",
-  },
-
   // Fonts
   { id: "font.language.group", type: "wstring" },
 
@@ -379,14 +369,6 @@ var gMainPane = {
       gMainPane.initBrowserLocale();
     }
 
-    let cfrLearnMoreUrl =
-      Services.urlFormatter.formatURLPref("app.support.baseURL") +
-      "extensionrecommendations";
-    for (const id of ["cfrLearnMore", "cfrFeaturesLearnMore"]) {
-      let link = document.getElementById(id);
-      link.setAttribute("href", cfrLearnMoreUrl);
-    }
-
     if (AppConstants.platform == "win") {
       // Functionality for "Show tabs in taskbar" on Windows 7 and up.
       try {

diff --git a/browser/components/preferences/in-content/main.xul b/browser/components/preferences/in-content/main.xul
@@ -654,20 +654,6 @@
   <checkbox id="searchStartTyping"
             data-l10n-id="browsing-search-on-start-typing"
             preference="accessibility.typeaheadfind"/>
-  <hbox align="center" data-subcategory="cfraddons">
-    <checkbox id="cfrRecommendations"
-            class="tail-with-learn-more"
-            data-l10n-id="browsing-cfr-recommendations"
-            preference="browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons"/>
-    <label id="cfrLearnMore" class="learnMore" data-l10n-id="browsing-cfr-recommendations-learn-more" is="text-link"/>
-  </hbox>
-  <hbox align="center" data-subcategory="cfrfeatures">
-    <checkbox id="cfrRecommendations-features"
-            class="tail-with-learn-more"
-            data-l10n-id="browsing-cfr-features"
-            preference="browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features"/>
-    <label id="cfrFeaturesLearnMore" class="learnMore" data-l10n-id="browsing-cfr-recommendations-learn-more" is="text-link"/>
-  </hbox>
 </groupbox>
 
 <hbox id="networkProxyCategory"