Chromium Code Reviews| Index: chrome/browser/policy/proto/chrome_device_policy.proto |
| diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto |
| index 2ed793354d189fbae08b22e133599a77ec49abdc..a79580ea64b482546052bf42663713f58235c154 100644 |
| --- a/chrome/browser/policy/proto/chrome_device_policy.proto |
| +++ b/chrome/browser/policy/proto/chrome_device_policy.proto |
| @@ -235,6 +235,15 @@ message DeviceLocalAccountsProto { |
| // The list of device-local accounts (i.e. accounts without an associated |
| // cloud-backed profile) that are available on the device. |
| repeated DeviceLocalAccountInfoProto account = 1; |
| + |
| + // The identifier of the device-local account to which the device |
| + // should be logged in automatically. Should be equal to one of the |
| + // ids in DeviceLocalAccountInfoProto. |
| + optional string auto_login_id = 2; |
| + |
| + // The amount of time, in milliseconds, that should elapse at the signin |
| + // screen without user interaction before automatically logging in. |
| + optional int64 auto_login_delay = 3; |
| } |
| message AllowRedeemChromeOsRegistrationOffersProto { |
| @@ -251,6 +260,16 @@ message StartUpFlagsProto { |
| repeated string flags = 1; |
| } |
| +message DeviceLocalAccountAutoLoginProto { |
|
Mattias Nissler (ping if slow)
2013/03/12 10:08:01
This no longer used, please remove.
dconnelly
2013/03/12 10:43:31
Ugh, came back in during rebase :(
Done.
|
| + // The identifier of the device-local account to which the device |
| + // should be logged in automatically. |
| + optional string id = 1; |
| + |
| + // The amount of time that should elapse at the signin screen before |
| + // automatically logging in. |
| + optional int64 delay = 2; |
| +} |
| + |
| message ChromeDeviceSettingsProto { |
| optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; |
| optional UserWhitelistProto user_whitelist = 2; |
| @@ -275,4 +294,5 @@ message ChromeDeviceSettingsProto { |
| optional DeviceLocalAccountsProto device_local_accounts = 21; |
| optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; |
| optional StartUpFlagsProto start_up_flags = 23; |
| + optional DeviceLocalAccountAutoLoginProto device_local_account_auto_login = 24; |
| } |