Index: chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
index d25115c6e1ee54b3eaa75398a76ddcca1336ccb0..ca5dde6a5ba21a11728475d639ef69aaec609d67 100644 |
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc |
@@ -117,8 +117,10 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, |
} |
if (policy.has_device_local_accounts()) { |
+ const em::DeviceLocalAccountsProto& container( |
+ policy.device_local_accounts()); |
const RepeatedPtrField<em::DeviceLocalAccountInfoProto>& accounts = |
- policy.device_local_accounts().account(); |
+ container.account(); |
if (accounts.size() > 0) { |
ListValue* account_list = new ListValue(); |
RepeatedPtrField<em::DeviceLocalAccountInfoProto>::const_iterator entry; |
@@ -131,6 +133,18 @@ void DecodeLoginPolicies(const em::ChromeDeviceSettingsProto& policy, |
POLICY_SCOPE_MACHINE, |
account_list); |
} |
+ if (container.has_auto_login_id()) { |
+ policies->Set(key::kDeviceLocalAccountAutoLoginId, |
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, |
+ Value::CreateStringValue(container.auto_login_id())); |
+ } |
+ if (container.has_auto_login_delay()) { |
+ policies->Set(key::kDeviceLocalAccountAutoLoginDelay, |
+ POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_MACHINE, |
+ DecodeIntegerValue(container.auto_login_delay())); |
+ } |
} |
} |