| Index: chrome/app/policy/policy_templates.json
|
| diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
|
| index f0f5d944c4a263a7c36984c8c550400d7edb3730..074416d1c3490561cc5cc7ff5965a5ad03c508f1 100644
|
| --- a/chrome/app/policy/policy_templates.json
|
| +++ b/chrome/app/policy/policy_templates.json
|
| @@ -118,7 +118,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: 249
|
| +# For your editing convenience: highest ID currently used: 250
|
| #
|
| # Placeholders:
|
| # The following placeholder strings are automatically substituted:
|
| @@ -3886,7 +3886,6 @@
|
| },
|
| 'supported_on': ['chrome_os:25-'],
|
| 'device_only': True,
|
| - 'future': True,
|
| 'features': {
|
| 'dynamic_refresh': True,
|
| },
|
| @@ -3946,7 +3945,6 @@
|
| 'features': {
|
| 'dynamic_refresh': True,
|
| },
|
| - 'future': True,
|
| 'example_value': True,
|
| 'id': 202,
|
| 'caption': '''Enable bailout keyboard shortcut for auto-login''',
|
| @@ -3957,6 +3955,24 @@
|
| If this policy is set to False, zero-delay auto-login (if configured) cannot be bypassed.'''
|
| },
|
| {
|
| + 'name': 'DeviceLocalAccountPromptForNetworkWhenOffline',
|
| + 'type': 'main',
|
| + 'schema': { 'type': 'boolean' },
|
| + 'supported_on': ['chrome_os:33-'],
|
| + 'device_only': True,
|
| + 'features': {
|
| + 'dynamic_refresh': True,
|
| + },
|
| + 'example_value': True,
|
| + 'id': 250,
|
| + 'caption': '''Enable network configuration prompt when offline''',
|
| + 'desc': '''Enable network configuration prompt when offline.
|
| +
|
| + If this policy is unset or set to True and a device-local account is configured for zero-delay auto-login and the device does not have access to the Internet, <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> will show a network configuration prompt.
|
| +
|
| + If this policy is set to False, an error message will be displayed instead of the network configuration prompt.'''
|
| + },
|
| + {
|
| 'name': 'BackgroundModeEnabled',
|
| 'type': 'main',
|
| 'schema': { 'type': 'boolean' },
|
|
|