| Index: chrome/browser/chromeos/settings/device_settings_provider.cc
|
| diff --git a/chrome/browser/chromeos/settings/device_settings_provider.cc b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| index f60f5445fc60662b41b5d35e859f25362091d5d2..e9c5b71883604be1ac6b294b705124d9eaadad63 100644
|
| --- a/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| +++ b/chrome/browser/chromeos/settings/device_settings_provider.cc
|
| @@ -44,6 +44,8 @@ const char* kKnownSettings[] = {
|
| kAccountsPrefShowUserNamesOnSignIn,
|
| kAccountsPrefUsers,
|
| kAccountsPrefDeviceLocalAccounts,
|
| + kAccountsPrefDeviceLocalAccountAutoLoginUsername,
|
| + kAccountsPrefDeviceLocalAccountAutoLoginTimerMillis,
|
| kAppPack,
|
| kDeviceOwner,
|
| kIdleLogoutTimeout,
|
| @@ -232,6 +234,22 @@ void DeviceSettingsProvider::SetInPolicy() {
|
| } else {
|
| NOTREACHED();
|
| }
|
| + } else if (prop == kAccountsPrefDeviceLocalAccountAutoLoginUsername) {
|
| + em::DeviceLocalAccountAutoLoginProto* auto_login =
|
| + device_settings_.mutable_device_local_account_auto_login();
|
| + std::string id;
|
| + if (value->GetAsString(&id))
|
| + auto_login->set_id(id);
|
| + else
|
| + NOTREACHED();
|
| + } else if (prop == kAccountsPrefDeviceLocalAccountAutoLoginTimerMillis) {
|
| + em::DeviceLocalAccountAutoLoginProto* auto_login =
|
| + device_settings_.mutable_device_local_account_auto_login();
|
| + int timer;
|
| + if (value->GetAsInteger(&timer))
|
| + auto_login->set_timer_millis(timer);
|
| + else
|
| + NOTREACHED();
|
| } else if (prop == kSignedDataRoamingEnabled) {
|
| em::DataRoamingEnabledProto* roam =
|
| device_settings_.mutable_data_roaming_enabled();
|
| @@ -395,6 +413,19 @@ void DeviceSettingsProvider::DecodeLoginPolicies(
|
| }
|
| }
|
| new_values_cache->SetValue(kAccountsPrefDeviceLocalAccounts, account_list);
|
| +
|
| + if (policy.has_device_local_account_auto_login()) {
|
| + if (policy.device_local_account_auto_login().has_id()) {
|
| + new_values_cache->SetString(
|
| + kAccountsPrefDeviceLocalAccountAutoLoginUsername,
|
| + policy.device_local_account_auto_login().id());
|
| + }
|
| + if (policy.device_local_account_auto_login().has_timer_millis()) {
|
| + new_values_cache->SetInteger(
|
| + kAccountsPrefDeviceLocalAccountAutoLoginTimerMillis,
|
| + policy.device_local_account_auto_login().timer_millis());
|
| + }
|
| + }
|
| }
|
|
|
| void DeviceSettingsProvider::DecodeKioskPolicies(
|
|
|