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 64b592d06a6491b852d5df71a9bd0689391ee291..ec25185c00b421dfad7f63c3e0afaac6395ee79d 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_provider.cc |
+++ b/chrome/browser/chromeos/settings/device_settings_provider.cc |
@@ -42,6 +42,7 @@ const char* kKnownSettings[] = { |
kAccountsPrefAllowGuest, |
kAccountsPrefAllowNewUser, |
kAccountsPrefDeviceLocalAccounts, |
+ kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, |
kAccountsPrefDeviceLocalAccountAutoLoginDelay, |
kAccountsPrefDeviceLocalAccountAutoLoginId, |
kAccountsPrefEphemeralUsersEnabled, |
@@ -255,6 +256,14 @@ void DeviceSettingsProvider::SetInPolicy() { |
device_local_accounts->set_auto_login_delay(delay); |
else |
NOTREACHED(); |
+ } else if (prop == kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled) { |
+ em::DeviceLocalAccountsProto* device_local_accounts = |
+ device_settings_.mutable_device_local_accounts(); |
+ bool enabled; |
+ if (value->GetAsBoolean(&enabled)) |
+ device_local_accounts->set_enable_auto_login_bailout(enabled); |
+ else |
+ NOTREACHED(); |
} else if (prop == kSignedDataRoamingEnabled) { |
em::DataRoamingEnabledProto* roam = |
device_settings_.mutable_data_roaming_enabled(); |
@@ -470,6 +479,11 @@ void DeviceSettingsProvider::DecodeLoginPolicies( |
kAccountsPrefDeviceLocalAccountAutoLoginDelay, |
policy.device_local_accounts().auto_login_delay()); |
} |
+ if (policy.device_local_accounts().has_enable_auto_login_bailout()) { |
+ new_values_cache->SetBoolean( |
+ kAccountsPrefDeviceLocalAccountAutoLoginBailoutEnabled, |
+ policy.device_local_accounts().enable_auto_login_bailout()); |
+ } |
} |
} |