summaryrefslogtreecommitdiffstats
path: root/chrome/app/policy
diff options
context:
space:
mode:
authorjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 20:13:55 +0000
committerjamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 20:13:55 +0000
commit562378fd4ff5b2d27b2e82bd0e47139ace2aa932 (patch)
tree8861bbfb68d2aaf1e562b4142dc3b05cf2134b1a /chrome/app/policy
parent66ae6e880d111087e776afbb7eccc3e5a8436e45 (diff)
downloadchromium_src-562378fd4ff5b2d27b2e82bd0e47139ace2aa932.zip
chromium_src-562378fd4ff5b2d27b2e82bd0e47139ace2aa932.tar.gz
chromium_src-562378fd4ff5b2d27b2e82bd0e47139ace2aa932.tar.bz2
Added PIN-less auth policy.
BUG=156182 Review URL: https://chromiumcodereview.appspot.com/20864002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/policy')
-rw-r--r--chrome/app/policy/policy_templates.json18
1 files changed, 17 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 93ef3fa..aeb4d5c9 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: 233
+# For your editing convenience: highest ID currently used: 234
#
# Placeholders:
# The following placeholder strings are automatically substituted:
@@ -588,6 +588,22 @@
If this setting is disabled or not set, then both local and remote users can interact with the host when it is being shared.''',
},
+ {
+ 'name': 'RemoteAccessHostAllowClientPairing',
+ 'type': 'main',
+ 'schema': { 'type': 'boolean' },
+ 'supported_on': ['chrome.*:30-'],
+ 'features': {
+ 'dynamic_refresh': True,
+ 'per_profile': False,
+ },
+ 'example_value': False,
+ 'id': 234,
+ 'caption': '''Enable or disable PIN-less authentication''',
+ 'desc': '''If this setting is enabled or not configured, then users can opt to pair clients and hosts at connection time, eliminating the need to enter a PIN every time.
+
+ If this setting is disabled, then this feature will not be available.''',
+ },
],
},
{