Index: chrome/app/policy/policy_templates.json |
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json |
index 91c9aa0b738c57d6d684dcf14a4d94773f8f717c..0773ad244fd543448060f26b2ebd656e05f6a808 100644 |
--- a/chrome/app/policy/policy_templates.json |
+++ b/chrome/app/policy/policy_templates.json |
@@ -94,7 +94,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: 96 |
+# For your editing convenience: highest ID currently used: 98 |
# |
# Placeholders: |
# The following placeholder strings are automatically substituted: |
@@ -1272,6 +1272,43 @@ |
'desc': '''Allows you to set whether websites are allowed to track the users' physical location. Tracking the users' physical location can be allowed by default, denied by default or the user can be asked everytime a website requests the pysical location.''', |
}, |
{ |
+ 'name': 'DefaultAutoSubmitCertificateSetting', |
+ 'type': 'int-enum', |
+ 'items': [ |
+ { |
+ 'name': 'AllowAutoSubmitCertificate', |
+ 'value': 1, |
+ 'caption': '''Allows <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex> to automatically select client certificates.''' |
+ }, |
+ { |
+ 'name': 'BlockAutoSubmitCertificate', |
+ 'value': 2, |
+ 'caption': '''Blocks certificates from being transfered to sites that requests client certificates.''' |
wtc
2011/08/18 22:03:38
Nit: transfered => sent
sites that requests => si
markusheintz_
2011/08/19 15:17:58
Done.
|
+ }, |
+ { |
+ 'name': 'AskAutoSubmitCertificat', |
wtc
2011/08/18 22:03:38
Typo: AskAutoSubmitCertificat is missing an 'e' at
markusheintz_
2011/08/19 15:17:58
Uuups. Done
|
+ 'value': 3, |
+ 'caption': '''Asks the user to select a certificate whenever a site requests a client certificate.''', |
+ }, |
wtc
2011/08/18 22:03:38
Can the names be simply "Auto" (or "AutoSelect"),
markusheintz_
2011/08/19 15:17:58
In general I would be fine with the names you sugg
|
+ ], |
+ 'supported_on': ['chrome.*:15-', 'chrome_os:0.15-'], |
+ 'features': {'dynamic_refresh': 1}, |
+ 'example_value': 1, |
+ 'id': 97, |
+ 'caption': '''Default setting for selecting client certificates''', |
+ 'desc': '''Allows you to set whether a client certificate should be automatically selected by <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex> (if possible), the user should be asked to select a client certificate or no certificates should be transmitted to sites requesting client certificates.''', |
wtc
2011/08/18 22:03:38
Nit: transmitted => sent
markusheintz_
2011/08/19 15:17:58
Done.
|
+ }, |
+ { |
+ 'name': 'AutoSubmitCertificateForUrls', |
+ 'type': 'list', |
+ 'supported_on': ['chrome.*:15-', 'chrome_os:0.15-'], |
+ 'features': {'dynamic_refresh': 1}, |
+ 'example_value': ['https://www.example.com', '[*.]example.edu'], |
+ 'id': 98, |
+ 'caption': '''Auto select client certificates for these sites''', |
wtc
2011/08/18 22:03:38
Nit: Auto select => Automatically select
markusheintz_
2011/08/19 15:17:58
Done.
|
+ 'desc': '''Allows you to specify a list of url patterns that specify sites for which <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex> should automatically select a client certificates, if the site requests a certificate.''', |
+ }, |
+ { |
'name': 'CookiesAllowedForUrls', |
'type': 'list', |
'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'], |