summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGaming4JC <g4jc@bulletmail.org>2018-09-07 20:48:23 -0400
committerGaming4JC <g4jc@bulletmail.org>2018-09-07 20:48:23 -0400
commitd537c7feaa440254f371a2355208fae09dd95316 (patch)
treebffcb19cd6245bcc0ad58f2220a16974dec43978 /app
parent691cd930f487a5dd9f60d68dc701ebd4bef96ad0 (diff)
downloadiceweasel-uxp-d537c7feaa440254f371a2355208fae09dd95316.tar.gz
Remove contextual identityv2.0
Diffstat (limited to 'app')
-rw-r--r--app/profile/iceweasel-uxp.js16
1 files changed, 5 insertions, 11 deletions
diff --git a/app/profile/iceweasel-uxp.js b/app/profile/iceweasel-uxp.js
index 92809e1..90c81b4 100644
--- a/app/profile/iceweasel-uxp.js
+++ b/app/profile/iceweasel-uxp.js
@@ -451,6 +451,11 @@ pref("javascript.options.showInConsole", true);
pref("general.warnOnAboutConfig", false);
#endif
+// TODO: Remove ContextualIdentityPrefs once possible in toolkit (BackgroundPageThumbs.jsm)
+pref("privacy.usercontext.about_newtab_segregation.enabled", false);
+pref("privacy.userContext.enabled", false);
+pref("privacy.userContext.ui.enabled", false);
+
// This is the pref to control the location bar, change this to true to
// force this - this makes the origin of popup windows more obvious to avoid
// spoofing. We would rather not do it by default because it affects UE for web
@@ -1258,17 +1263,6 @@ pref("privacy.trackingprotection.ui.enabled", true);
pref("privacy.trackingprotection.ui.enabled", false);
#endif
-// Enable Contextual Identity Containers
-#ifdef NIGHTLY_BUILD
-pref("privacy.userContext.enabled", true);
-pref("privacy.userContext.ui.enabled", true);
-pref("privacy.usercontext.about_newtab_segregation.enabled", true);
-#else
-pref("privacy.userContext.enabled", false);
-pref("privacy.userContext.ui.enabled", false);
-pref("privacy.usercontext.about_newtab_segregation.enabled", false);
-#endif
-
#ifndef RELEASE_OR_BETA
// At the moment, autostart.2 is used, while autostart.1 is unused.
// We leave it here set to false to reset users' defaults and allow