Bug 1496671 - Final pref changes for Content Blocking in Firefox 63. r=Gijs,baku a=pascalc
Differential Revision:
https://phabricator.services.mozilla.com/D8068
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1498,21 +1498,31 @@ pref("browser.ping-centre.log", false);
pref("browser.ping-centre.staging.endpoint", "https://onyx_tiles.stage.mozaws.net/v3/links/ping-centre");
pref("browser.ping-centre.production.endpoint", "https://tiles.services.mozilla.com/v3/links/ping-centre");
// Enable GMP support in the addon manager.
pref("media.gmp-provider.enabled", true);
pref("browser.contentblocking.allowlist.storage.enabled", true);
+#ifdef NIGHTLY_BUILD
pref("browser.contentblocking.global-toggle.enabled", true);
+#else
+pref("browser.contentblocking.global-toggle.enabled", false);
+#endif
// Define a set of default features for the Content Blocking UI
+#ifdef EARLY_BETA_OR_EARLIER
pref("browser.contentblocking.fastblock.ui.enabled", true);
pref("browser.contentblocking.fastblock.control-center.ui.enabled", true);
+#else
+pref("browser.contentblocking.fastblock.ui.enabled", false);
+pref("browser.contentblocking.fastblock.control-center.ui.enabled", false);
+#endif
+
pref("browser.contentblocking.trackingprotection.ui.enabled", true);
pref("browser.contentblocking.trackingprotection.control-center.ui.enabled", true);
pref("browser.contentblocking.rejecttrackers.ui.enabled", true);
pref("browser.contentblocking.rejecttrackers.ui.recommended", true);
pref("browser.contentblocking.rejecttrackers.control-center.ui.enabled", true);
pref("browser.contentblocking.cookies-site-data.ui.reject-trackers.recommended", true);
pref("browser.contentblocking.cookies-site-data.ui.reject-trackers.enabled", true);
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1278,28 +1278,22 @@ PREF("preferences.allow.omt-write", bool
// Whether Content Blocking has been enabled.
VARCACHE_PREF(
"browser.contentblocking.enabled",
browser_contentblocking_enabled,
bool, true
)
-#ifdef NIGHTLY_BUILD
-# define PREF_VALUE true
-#else
-# define PREF_VALUE false
-#endif
// Whether Content Blocking UI has been enabled.
VARCACHE_PREF(
"browser.contentblocking.ui.enabled",
browser_contentblocking_ui_enabled,
- bool, PREF_VALUE
+ bool, true
)
-#undef PREF_VALUE
// Whether Content Blocking Third-Party Cookies UI has been enabled.
VARCACHE_PREF(
"browser.contentblocking.allowlist.storage.enabled",
browser_contentblocking_allowlist_storage_enabled,
bool, false
)