Commit 144c29c2 authored by Saurabh Nijhara's avatar Saurabh Nijhara Committed by Commit Bot

Deprecate proto for policy SupervisedUsersEnabled.

This CL marks the proto for the deprecated device policy SupervisedUsersEnabled as deprecated. The policy SupervisedUsersEnabled has already been deprecated in CL 1221253 and the code for reading from the proto SupervisedUsersSettingsProto was removed in the CL 1224033.

Bug: 834488
Change-Id: I067708d9e3eb1defb5b92b9c1276a39998316495
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2038773Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarSergey Poromov <poromov@chromium.org>
Commit-Queue: Saurabh Nijhara <snijhara@google.com>
Cr-Commit-Position: refs/heads/master@{#739020}
parent 3f823a97
...@@ -458,14 +458,6 @@ void OwnerSettingsServiceChromeOS::UpdateDeviceSettings( ...@@ -458,14 +458,6 @@ void OwnerSettingsServiceChromeOS::UpdateDeviceSettings(
guest->set_guest_mode_enabled(guest_value); guest->set_guest_mode_enabled(guest_value);
else else
NOTREACHED(); NOTREACHED();
} else if (path == kAccountsPrefSupervisedUsersEnabled) {
em::SupervisedUsersSettingsProto* supervised =
settings.mutable_supervised_users_settings();
bool supervised_value;
if (value.GetAsBoolean(&supervised_value))
supervised->set_supervised_users_enabled(supervised_value);
else
NOTREACHED();
} else if (path == kAccountsPrefShowUserNamesOnSignIn) { } else if (path == kAccountsPrefShowUserNamesOnSignIn) {
em::ShowUserNamesOnSigninProto* show = settings.mutable_show_user_names(); em::ShowUserNamesOnSigninProto* show = settings.mutable_show_user_names();
bool show_value; bool show_value;
...@@ -639,6 +631,7 @@ void OwnerSettingsServiceChromeOS::UpdateDeviceSettings( ...@@ -639,6 +631,7 @@ void OwnerSettingsServiceChromeOS::UpdateDeviceSettings(
} else { } else {
// The remaining settings don't support Set(), since they are not // The remaining settings don't support Set(), since they are not
// intended to be customizable by the user: // intended to be customizable by the user:
// kAccountsPrefSupervisedUsersEnabled
// kAccountsPrefTransferSAMLCookies // kAccountsPrefTransferSAMLCookies
// kDeviceAttestationEnabled // kDeviceAttestationEnabled
// kDeviceOwner // kDeviceOwner
......
...@@ -843,9 +843,9 @@ message AccessibilitySettingsProto { ...@@ -843,9 +843,9 @@ message AccessibilitySettingsProto {
optional PolicyOptions login_screen_shortcuts_enabled_options = 35; optional PolicyOptions login_screen_shortcuts_enabled_options = 35;
} }
message SupervisedUsersSettingsProto { message OBSOLETE_SupervisedUsersSettingsProto {
// Defines whether supervised users can be created on the device. // Defines whether supervised users can be created on the device.
optional bool supervised_users_enabled = 1; optional bool OBSOLETE_supervised_users_enabled = 1 [deprecated = true];
} }
message LoginScreenPowerManagementProto { message LoginScreenPowerManagementProto {
...@@ -1591,7 +1591,8 @@ message ChromeDeviceSettingsProto { ...@@ -1591,7 +1591,8 @@ message ChromeDeviceSettingsProto {
optional VariationsParameterProto variations_parameter = 25; optional VariationsParameterProto variations_parameter = 25;
optional AttestationSettingsProto attestation_settings = 26; optional AttestationSettingsProto attestation_settings = 26;
optional AccessibilitySettingsProto accessibility_settings = 27; optional AccessibilitySettingsProto accessibility_settings = 27;
optional SupervisedUsersSettingsProto supervised_users_settings = 28; optional OBSOLETE_SupervisedUsersSettingsProto supervised_users_settings = 28
[deprecated = true];
optional LoginScreenPowerManagementProto login_screen_power_management = 29; optional LoginScreenPowerManagementProto login_screen_power_management = 29;
optional SystemUse24HourClockProto use_24hour_clock = 30; optional SystemUse24HourClockProto use_24hour_clock = 30;
optional AutoCleanupSettigsProto auto_clean_up_settings = 31; optional AutoCleanupSettigsProto auto_clean_up_settings = 31;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment