Index: chrome/browser/policy/proto/chromeos/chrome_device_policy.proto |
diff --git a/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto b/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto |
index ec401572adbd55474aa1ac2f12fd2f99899d6e75..6c95ebfa338ebc33b4947482299a90a15bd11b25 100644 |
--- a/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto |
+++ b/chrome/browser/policy/proto/chromeos/chrome_device_policy.proto |
@@ -226,13 +226,39 @@ 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 '@'. |
- optional string id = 1; |
+ // Deprecated: Account identifier for a public session device-local account. |
+ // Old code didn't have the |type| field, so it can't handle new types of |
+ // device-local accounts gracefully (i.e. ignoring unsupported types). New |
+ // code should instead set type to ACCOUNT_TYPE_PUBLIC_SESSION and write the |
+ // identifier to the |account_id| field below. If the |type| field is present, |
+ // |deprecated_public_session_id| will be ignored. |
+ optional string deprecated_public_session_id = 1; |
binzhao
2013/04/30 22:01:10
My understanding is that the old client has no kno
Mattias Nissler (ping if slow)
2013/04/30 23:37:37
The issue is forward-compatibility: IMHO, old clie
binzhao
2013/05/01 00:30:44
OK, I agree when admin configures KIOSK, then pre-
Mattias Nissler (ping if slow)
2013/05/01 10:10:55
Yes that'd be helpful. It's probably not strictly
binzhao
2013/05/01 16:56:49
Is there a good way to tell most of the devices ha
|
+ |
+ // 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 account_id = 2; |
+ |
+ // Indicates the type of device-local account. |
+ enum AccountType { |
+ // A login-less, policy-configured browsing session. |
+ ACCOUNT_TYPE_PUBLIC_SESSION = 0; |
+ // An account that serves as a container for a single full-screen app. |
+ ACCOUNT_TYPE_KIOSK_APP = 1; |
+ }; |
+ |
+ // The account type. |
+ optional AccountType type = 3; |
binzhao
2013/04/30 22:01:10
we can specify the default to be ACCOUNT_TYPE_PUBL
Mattias Nissler (ping if slow)
2013/04/30 23:37:37
See my comment above.
binzhao
2013/05/01 00:30:44
Is Chromium using proto1 or proto2?
I am not very
Mattias Nissler (ping if slow)
2013/05/01 10:10:55
If read the code and tested it against a proto con
binzhao
2013/05/01 16:56:49
Right, if you check hasXXX(), then it is fine. If
|
+ |
+ // For ACCOUNT_TYPE_KIOSK_APP, indicates the app that should be run. 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 = 4; |
binzhao
2013/05/01 00:30:44
Do we want to define a wrapper message type - Kios
Mattias Nissler (ping if slow)
2013/05/01 10:10:55
Fair, I'll do that.
|
+ |
+ // 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 = 5; |
} |
message DeviceLocalAccountsProto { |
@@ -248,6 +274,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 |
+ // 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 { |