tor-browser

commit c372ce9dbe80a676e85d86cd5278d090dc97df3c
parent cb66b5da9ff90c616e9d1b4e015af09be199154d
Author: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date:   Tue, 21 Oct 2025 12:16:51 +0000

Bug 1994791 - Chatbot policy should turn off context menu. r=gerard-majax

Differential Revision: https://phabricator.services.mozilla.com/D269272

Diffstat:
M
browser/components/enterprisepolicies/Policies.sys.mjs
 | 
12
+++++++-----
M
browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
 | 
17
+++++++++++++++++

2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -1608,15 +1608,17 @@ export var Policies = {
       const defaultValue = "Enabled" in param ? param.Enabled : undefined;
 
       const features = [
-        ["Chatbot", "browser.ml.chat.enabled"],
-        ["LinkPreviews", "browser.ml.linkPreview.optin"],
-        ["TabGroups", "browser.tabs.groups.smart.userEnabled"],
+        ["Chatbot", ["browser.ml.chat.enabled", "browser.ml.chat.page"]],
+        ["LinkPreviews", ["browser.ml.linkPreview.optin"]],
+        ["TabGroups", ["browser.tabs.groups.smart.userEnabled"]],
       ];
 
-      for (const [key, pref] of features) {
+      for (const [key, prefs] of features) {
         const value = key in param ? param[key] : defaultValue;
         if (value !== undefined) {
-          PoliciesUtils.setDefaultPref(pref, value, param.Locked);
+          for (const pref of prefs) {
+            PoliciesUtils.setDefaultPref(pref, value, param.Locked);
+          }
         }
       }
     },
diff --git a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
@@ -1223,6 +1223,23 @@ const POLICIES_TESTS = [
       "security.webauthn.always_allow_direct_attestation": true,
     },
   },
+
+  // GenerativeAI
+  {
+    policies: {
+      GenerativeAI: {
+        Enabled: false,
+        Chatbot: true,
+        Locked: true,
+      },
+    },
+    lockedPrefs: {
+      "browser.ml.chat.enabled": true,
+      "browser.ml.chat.page": true,
+      "browser.ml.linkPreview.optin": false,
+      "browser.tabs.groups.smart.userEnabled": false,
+    },
+  },
 ];
 
 add_task(async function test_policy_simple_prefs() {