Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: chrome/browser/policy/device_policy_decoder_chromeos.cc

Issue 12218078: Implement a policy to autologin a public account. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: split out FakeSessionManagerClient Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/device_policy_decoder_chromeos.cc
diff --git a/chrome/browser/policy/device_policy_decoder_chromeos.cc b/chrome/browser/policy/device_policy_decoder_chromeos.cc
index c6430c87039176c9c92eaf16ee5a106b23ea0b43..4dfb943dae3b462087cba22118d580031d792b00 100644
--- a/chrome/browser/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/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()));
+ }
}
}

Powered by Google App Engine
This is Rietveld 408576698