Chromium Code Reviews| Index: chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| diff --git a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| index 862f518b60ac5492e7640aeb1827f565c99471a7..d193114d8e7873e439eb705b363ce4769525eae0 100644 |
| --- a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| +++ b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto |
| @@ -226,13 +226,20 @@ message SystemTimezoneProto { |
| // Describes a single device-local account. |
| message DeviceLocalAccountInfoProto { |
| - // Identifier for the device-local account. Account identifiers loosely follow |
| - // the conventions for email addresses as specified by RFC 5322, e.g. local |
| - // (user name) and domain parts, separated by the '@' character. |
| - // Policy-configured device-local accounts are on the same domain that the |
| - // device is enrolled to. In contrast to RFC 5322 (which is more restrictive), |
| - // the local part may contain any characters other than '@'. |
| + // Identifier for the device-local account. This is an opaque identifier that |
| + // is used to distinguish different device-local accounts configured. All |
| + // configured accounts on a device must have unique identifiers. |
| optional string id = 1; |
| + |
| + // If present, indicates that this device-local account serves as a container |
| + // for a Kiosk App. The string value should be a valid 32-character Chrome App |
| + // identifier and specifies the Kiosk app to download and run. |
| + optional string kiosk_app_id = 2; |
| + |
| + // Optional extension update URL to download the Kiosk App package from. If |
| + // not specified, the app will be downloaded from the standard Chrome Web |
| + // Store update URL. |
| + optional string kiosk_app_update_url = 3; |
| } |
| message DeviceLocalAccountsProto { |
| @@ -248,6 +255,12 @@ message DeviceLocalAccountsProto { |
| // 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; |
| + |
| + // Whether the keyboard shortcut to prevent zero-delay auto-login should be |
|
bartfab (slow)
2013/04/25 11:17:28
Does this affect all device-local accounts or kios
Mattias Nissler (ping if slow)
2013/04/26 09:10:05
It should eventually affect all device-local accou
|
| + // enabled or not. If this keyboard shortcut is engaged, the auto-login will |
| + // be delayed by 3 minutes so administrators can log in or make configuration |
| + // changes. |
| + optional bool enable_auto_login_bailout = 4 [default = true]; |
| } |
| message AllowRedeemChromeOsRegistrationOffersProto { |