From 0a0e35c404b9c02162ae84e9680c85e70b3d5f3e Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 30 Oct 2025 15:11:21 +0000 Subject: [PATCH] Bug 1994791 - Chatbot policy should turn off context menu. a=pascalc DONTBUILD Original Revision: https://phabricator.services.mozilla.com/D269272 Differential Revision: https://phabricator.services.mozilla.com/D270676 --- .../enterprisepolicies/Policies.sys.mjs | 12 +++++++----- .../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 index 991a5d4126e9..a9dc4fb8f036 100644 --- a/browser/components/enterprisepolicies/Policies.sys.mjs +++ b/browser/components/enterprisepolicies/Policies.sys.mjs @@ -1581,15 +1581,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 index 541a047cdf29..accf174e62d8 100644 --- a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js +++ b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js @@ -1199,6 +1199,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() {