summaryrefslogtreecommitdiffstats
path: root/browser/components/enterprisepolicies/Policies.sys.mjs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 05:22:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-21 05:22:11 +0000
commit724b36b7051c0d9190cbd8854ba5919904967c11 (patch)
tree8996ac57bf70972bf524e865e0845cd54aab6f6b /browser/components/enterprisepolicies/Policies.sys.mjs
parentReleasing progress-linux version 115.10.0esr-1~deb12u1progress7u1. (diff)
downloadfirefox-esr-724b36b7051c0d9190cbd8854ba5919904967c11.tar.xz
firefox-esr-724b36b7051c0d9190cbd8854ba5919904967c11.zip
Merging upstream version 115.11.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/components/enterprisepolicies/Policies.sys.mjs')
-rw-r--r--browser/components/enterprisepolicies/Policies.sys.mjs12
1 files changed, 6 insertions, 6 deletions
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
index 8ad1349441..858c5ba7dc 100644
--- a/browser/components/enterprisepolicies/Policies.sys.mjs
+++ b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -1725,6 +1725,8 @@ export var Policies = {
"places.",
"pref.",
"print.",
+ "privacy.userContext.enabled",
+ "privacy.userContext.ui.enabled",
"signon.",
"spellchecker.",
"toolkit.legacyUserProfileCustomizations.stylesheets",
@@ -1904,13 +1906,11 @@ export var Policies = {
onBeforeAddons(manager, param) {
if (param.Locked) {
manager.disallowFeature("changeProxySettings");
- lazy.ProxyPolicies.configureProxySettings(param, setAndLockPref);
- } else {
- lazy.ProxyPolicies.configureProxySettings(
- param,
- PoliciesUtils.setDefaultPref
- );
}
+ lazy.ProxyPolicies.configureProxySettings(
+ param,
+ PoliciesUtils.setDefaultPref
+ );
},
},