Make AddProfile and GuestMode available on Lacros.
Make BrowserGuestModeEnabled and BrowserAddPersonEnabled supported
on ChromeOS so they are available for Lacros.
These policies used to be available on Lacros when it used policies
supported on chrome.linux platform. Later Lacros switched to policies
for chrome_os and policies become unvavailable.
So this change brings the two policies back.
Fixed: chromium:1245299, chromium:1245297
Test: browser_tests --gtest_filter="*PolicyPrefsTest*"
Change-Id: Ie925c2a3c12b93a5f7342bad38ac9d9858a5c845
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3431046
Reviewed-by: Alexander Hendrich <hendrich@chromium.org>
Commit-Queue: Artem Sumaneev <asumaneev@google.com>
Cr-Commit-Position: refs/heads/main@{#966703}
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 07e195f..61e52a3 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -630,6 +630,9 @@
{ key::kWebHidBlockedForUrls,
prefs::kManagedWebHidBlockedForUrls,
base::Value::Type::LIST },
+ { key::kBrowserAddPersonEnabled,
+ prefs::kBrowserAddPersonEnabled,
+ base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID)
{ key::kDefaultFileHandlingGuardSetting,
prefs::kManagedDefaultFileHandlingGuardSetting,
@@ -1374,9 +1377,6 @@
{ key::kNativeMessagingUserLevelHosts,
extensions::pref_names::kNativeMessagingUserLevelHosts,
base::Value::Type::BOOLEAN },
- { key::kBrowserAddPersonEnabled,
- prefs::kBrowserAddPersonEnabled,
- base::Value::Type::BOOLEAN },
{ key::kPrintPreviewUseSystemDefaultPrinter,
prefs::kPrintPreviewUseSystemDefaultPrinter,
base::Value::Type::BOOLEAN },
diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json
index cfb7628d..d04295ef 100644
--- a/chrome/test/data/policy/policy_test_cases.json
+++ b/chrome/test/data/policy/policy_test_cases.json
@@ -6977,16 +6977,39 @@
"os": [
"win",
"linux",
- "mac"
+ "mac",
+ "chromeos_ash",
+ "chromeos_lacros"
],
"policy_pref_mapping_tests": [
{
+ "policies": {},
+ "prefs": {
+ "profile.browser_guest_enabled": {
+ "location": "local_state",
+ "default_value": true
+ }
+ }
+ },
+ {
"policies": {
"BrowserGuestModeEnabled": true
},
"prefs": {
"profile.browser_guest_enabled": {
- "location": "local_state"
+ "location": "local_state",
+ "value": true
+ }
+ }
+ },
+ {
+ "policies": {
+ "BrowserGuestModeEnabled": false
+ },
+ "prefs": {
+ "profile.browser_guest_enabled": {
+ "location": "local_state",
+ "value": false
}
}
}
@@ -7015,16 +7038,39 @@
"os": [
"win",
"linux",
- "mac"
+ "mac",
+ "chromeos_ash",
+ "chromeos_lacros"
],
"policy_pref_mapping_tests": [
{
+ "policies": {},
+ "prefs": {
+ "profile.add_person_enabled": {
+ "location": "local_state",
+ "default_value": true
+ }
+ }
+ },
+ {
"policies": {
"BrowserAddPersonEnabled": true
},
"prefs": {
"profile.add_person_enabled": {
- "location": "local_state"
+ "location": "local_state",
+ "value": true
+ }
+ }
+ },
+ {
+ "policies": {
+ "BrowserAddPersonEnabled": false
+ },
+ "prefs": {
+ "profile.add_person_enabled": {
+ "location": "local_state",
+ "value": false
}
}
}
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index 80cb7f6e..4dd3f69c 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -15973,7 +15973,7 @@
'owners': ['mlerman@chromium.org', 'zmin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
- 'supported_on': ['chrome.*:38-'],
+ 'supported_on': ['chrome.*:38-', 'chrome_os:100-'],
'features': {
'dynamic_refresh': True,
'per_profile': False,
@@ -15982,9 +15982,11 @@
'id': 275,
'caption': '''Enable guest mode in browser''',
'tags': [],
- 'desc': '''If this policy is set to true or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will enable guest logins. Guest logins are <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profiles where all windows are in incognito mode.
+ 'desc': '''If this policy is set to true or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and <ph name="LACROS_NAME">Lacros</ph> will enable guest logins. Guest logins are <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> profiles where all windows are in incognito mode.
- If this policy is set to false, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not allow guest profiles to be started.''',
+ If this policy is set to false, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and <ph name="LACROS_NAME">Lacros</ph> will not allow guest profiles to be started.
+
+ Note: If this policy is not configured or set to true, but <ph name="LACROS_SECONDARY_PROFILES_ALLOWED_POLICY_NAME">LacrosSecondaryProfilesAllowed</ph> is set to false, <ph name="LACROS_NAME">Lacros</ph> will not allow guest profiles to be started.''',
},
{
'name': 'BrowserGuestModeEnforced',
@@ -16009,7 +16011,7 @@
'owners': ['mlerman@chromium.org', 'zmin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
- 'supported_on': ['chrome.*:39-'],
+ 'supported_on': ['chrome.*:39-', 'chrome_os:100-'],
'features': {
'dynamic_refresh': True,
'per_profile': False,
@@ -16018,9 +16020,11 @@
'id': 276,
'caption': '''Enable add person in user manager''',
'tags': [],
- 'desc': '''If this policy is set to true or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will allow Add Person from the user manager.
+ 'desc': '''If this policy is set to true or not configured, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and <ph name="LACROS_NAME">Lacros</ph> will allow to add a new person from the user manager.
- If this policy is set to false, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will not allow creation of new profiles from the user manager.''',
+ If this policy is set to false, <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> and <ph name="LACROS_NAME">Lacros</ph> will not allow adding a new person from the user manager.
+
+ Note: If this policy is not configured or set to true, but <ph name="LACROS_SECONDARY_PROFILES_ALLOWED_POLICY_NAME">LacrosSecondaryProfilesAllowed</ph> is set to false, <ph name="LACROS_NAME">Lacros</ph> will not allow adding a new person from the user manager.''',
},
{
'name': 'ForceBrowserSignin',
@@ -27592,11 +27596,11 @@
'tags': [],
'desc': '''This setting allows users to create and use secondary profiles, and use guest mode in the <ph name="LACROS_NAME">Lacros</ph> browser.
- Similar to both BrowserAddPersonEnabled and BrowserGuestModeEnabled, if this policy is set to false or unset, the user cannot create or use secondary profiles, and use guest mode. Previously created secondary profiles, if any, will be unavailable.
+ Similar to both <ph name="BROWSER_ADD_PERSON_ENABLED_POLICY_NAME">BrowserAddPersonEnabled</ph> and <ph name="BROWSER_GUEST_MODE_ENABLED_POLICY_NAME">BrowserGuestModeEnabled</ph>, if this policy is set to false or unset, the user cannot create or use secondary profiles, and use guest mode. Previously created secondary profiles, if any, will be unavailable.
If this policy is set to true, the user can create and use secondary profiles, and use guest mode.
- Note, that if this policy is set to true but BrowserAddPersonEnabled is set to false, the user cannot create secondary profiles. The same for BrowserGuestModeEnabled and guest mode.''',
+ Note: If this policy is set to true but <ph name="BROWSER_ADD_PERSON_ENABLED_POLICY_NAME">BrowserAddPersonEnabled</ph> is set to false, the user cannot create secondary profiles. The same for <ph name="BROWSER_GUEST_MODE_ENABLED_POLICY_NAME">BrowserGuestModeEnabled</ph> and guest mode.''',
},
{
'name': 'LacrosAvailability',
