Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(530)

Unified Diff: chrome/app/policy/policy_templates.json

Issue 14306004: Put Kiosk App parameters into device settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index dad016adf0ae2055a6e7cb1275fb99d33c703ab2..8b9e8b75aa8764feb33bb61faec004ce90139594 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: 201
+# For your editing convenience: highest ID currently used: 202
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -3589,6 +3589,25 @@
This policy is specified in milliseconds.'''
},
{
+ 'name': 'DeviceLocalAccountAutoLoginBailoutEnabled',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome_os:28-'],
+ 'device_only': True,
+ 'features': {
+ 'dynamic_refresh': True,
+ },
+ 'future': True,
+ 'example_value': True,
+ 'id': 202,
+ 'caption': '''Enable bailout keyboard shortcut for auto-login''',
+ 'desc': '''Enable bailout keyboard shortcut for auto-login.
+
+ If this policy is unset or set to True and a device-local account is configured for zero-delay auto-login, <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> will honor the keyboard shortcut Ctrl+Alt+S for bypassing auto-login and showing the login screen.
+
+ If this policy is set to False, zero-delay auto-login (if configured) cannot be bypassed.'''
+ },
+ {
'name': 'BackgroundModeEnabled',
'type': 'main',
'schema': { 'type': 'boolean' },
« no previous file with comments | « no previous file | chrome/browser/chromeos/app_mode/kiosk_app_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698