| Index: chrome/app/policy/policy_templates.json
|
| diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
|
| index f28c5628d392ecd37a054ab3e386a66cad0716d1..4d262154a22e7dcffbd2b8d364a5870130f3a49c 100644
|
| --- a/chrome/app/policy/policy_templates.json
|
| +++ b/chrome/app/policy/policy_templates.json
|
| @@ -112,7 +112,7 @@
|
| # persistent IDs for all fields (but not for groups!) are needed. These are
|
| # specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
|
| # because doing so would break the deployed wire format!
|
| -# For your editing convenience: highest ID currently used: 191
|
| +# For your editing convenience: highest ID currently used: 193
|
| #
|
| # Placeholders:
|
| # The following placeholder strings are automatically substituted:
|
| @@ -3543,6 +3543,46 @@
|
| Every list entry specifies an identifier, which is used internally to tell the different device-local accounts apart.''',
|
| },
|
| {
|
| + 'name': 'DeviceLocalAccountAutoLoginId',
|
| + 'type': 'string',
|
| + 'schema': { 'type': 'string' },
|
| + 'supported_on': ['chrome_os:26-'],
|
| + 'device_only': True,
|
| + 'features': {
|
| + 'dynamic_refresh': True,
|
| + },
|
| + 'example_value': "public@example.com",
|
| + 'id': 192,
|
| + 'caption': '''Public session for auto-login''',
|
| + 'desc': '''A public session to auto-login after a delay.
|
| +
|
| + If this policy is set, the specified session will be automatically logged in after a period of time has elapsed at the login screen without user interaction. The public session must already be configured (see |DeviceLocalAccounts|).
|
| +
|
| + If this policy is unset, there will be no auto-login.''',
|
| + },
|
| + {
|
| + 'name': 'DeviceLocalAccountAutoLoginDelay',
|
| + 'type': 'int',
|
| + 'schema': { 'type': 'integer' },
|
| + 'supported_on': ['chrome_os:26-'],
|
| + 'device_only': True,
|
| + 'features': {
|
| + 'dynamic_refresh': True,
|
| + },
|
| + 'example_value': 180000,
|
| + 'id': 193,
|
| + 'caption': '''Public session auto-login timer''',
|
| + 'desc': '''The public session auto-login delay.
|
| +
|
| + If the |DeviceLocalAccountAutoLoginId| policy is unset, this policy has no effect. Otherwise:
|
| +
|
| + If this policy is set, it determines the amount of time without user activity that should elapse before automatically logging into the public session specified by the |DeviceLocalAccountAutoLoginId| policy.
|
| +
|
| + If this policy is unset, 0 milliseconds will be used as the timeout.
|
| +
|
| + This policy is specified in milliseconds.'''
|
| + },
|
| + {
|
| 'name': 'BackgroundModeEnabled',
|
| 'type': 'main',
|
| 'schema': { 'type': 'boolean' },
|
|
|