summaryrefslogtreecommitdiffstats
path: root/browser/components
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--browser/components/enterprisepolicies/Policies.sys.mjs14
-rw-r--r--browser/components/enterprisepolicies/schemas/policies-schema.json8
-rw-r--r--browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js13
-rw-r--r--browser/components/search/schema/search-telemetry-schema.json39
4 files changed, 66 insertions, 8 deletions
diff --git a/browser/components/enterprisepolicies/Policies.sys.mjs b/browser/components/enterprisepolicies/Policies.sys.mjs
index 21c5bfaa67..8ad1349441 100644
--- a/browser/components/enterprisepolicies/Policies.sys.mjs
+++ b/browser/components/enterprisepolicies/Policies.sys.mjs
@@ -303,6 +303,18 @@ export var Policies = {
},
},
+ AutofillAddressEnabled: {
+ onBeforeAddons(manager, param) {
+ setAndLockPref("extensions.formautofill.addresses.enabled", param);
+ },
+ },
+
+ AutofillCreditCardEnabled: {
+ onBeforeAddons(manager, param) {
+ setAndLockPref("extensions.formautofill.creditCards.enabled", param);
+ },
+ },
+
AutoLaunchProtocolsFromOrigins: {
onBeforeAddons(manager, param) {
for (let info of param) {
@@ -599,8 +611,6 @@ export var Policies = {
"browser.download.dir",
replacePathVariables(param)
);
- // If a custom download directory is being used, just lock folder list to 2.
- setAndLockPref("browser.download.folderList", 2);
},
},
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
index 8ff88935dd..e2161107af 100644
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -86,6 +86,14 @@
}
},
+ "AutofillAddressEnabled": {
+ "type": "boolean"
+ },
+
+ "AutofillCreditCardEnabled": {
+ "type": "boolean"
+ },
+
"AutoLaunchProtocolsFromOrigins": {
"type": ["array", "JSON"],
"items": {
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 47cd33460c..0a8d77d483 100644
--- a/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
+++ b/browser/components/enterprisepolicies/tests/xpcshell/test_simple_pref_policies.js
@@ -1021,6 +1021,19 @@ const POLICIES_TESTS = [
"browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features": true,
},
},
+
+ // POLICY: AutofillAddressEnabled, AutofillCreditCardEnabled
+
+ {
+ policies: {
+ AutofillAddressEnabled: false,
+ AutofillCreditCardEnabled: false,
+ },
+ lockedPrefs: {
+ "extensions.formautofill.addresses.enabled": false,
+ "extensions.formautofill.creditCards.enabled": false,
+ },
+ },
];
add_task(async function test_policy_simple_prefs() {
diff --git a/browser/components/search/schema/search-telemetry-schema.json b/browser/components/search/schema/search-telemetry-schema.json
index 872166d44c..58dacca965 100644
--- a/browser/components/search/schema/search-telemetry-schema.json
+++ b/browser/components/search/schema/search-telemetry-schema.json
@@ -238,6 +238,15 @@
"description": "The matching regular expression."
}
},
+ "nonAdsLinkQueryParamNames": {
+ "type": "array",
+ "title": "Non-ads link query param names",
+ "description": "Query param names present in non-ads link that recover the link that will be redirected to.",
+ "items": {
+ "type": "string",
+ "string": "The query param name to examine."
+ }
+ },
"nonAdsLinkRegexps": {
"type": "array",
"title": "Non-ads link matching regular expressions",
@@ -333,7 +342,7 @@
"description": "The query to inspect all elements on the SERP."
},
"method": {
- "enum": ["data-attribute"],
+ "enum": ["dataAttribute"],
"description": "The extraction method used for the query."
},
"options": {
@@ -366,19 +375,37 @@
"queryParamKey": {
"type": "string",
"description": "The query parameter key to inspect in the href."
+ },
+ "queryParamValueIsHref": {
+ "type": "boolean",
+ "description": "Whether the query param value is expected to contain an href."
}
},
"required": ["queryParamKey"]
}
},
"required": ["selectors", "method"]
+ },
+ {
+ "type": "object",
+ "properties": {
+ "selectors": {
+ "type": "string",
+ "description": "The query to use to inspect all elements on the SERP."
+ },
+ "method": {
+ "enum": ["textContent"],
+ "description": "The extraction method to use for the query."
+ }
+ },
+ "required": ["selectors", "method"]
}
]
+ },
+ "skipCount": {
+ "title": "Skip Count",
+ "description": "Whether to skip reporting of the count of these elements to ad_impressions. Defaults to false.",
+ "type": "boolean"
}
- },
- "skipCount": {
- "title": "Skip Count",
- "description": "Whether to skip reporting of the count of these elements to ad_impressions. Defaults to false.",
- "type": "boolean"
}
}