Index: components/policy/resources/policy_templates.json |
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json |
index 5e23030364665fe059e25f59e5d2be269ffd062a..5b932089b3fa70ac0a311789a866a50941decc7c 100644 |
--- a/components/policy/resources/policy_templates.json |
+++ b/components/policy/resources/policy_templates.json |
@@ -3053,6 +3053,38 @@ |
If this policy is left not set, 'PromptOnAccess' will be used and the user will be able to change it.''', |
}, |
{ |
+ 'name': 'DefaultKeygenSetting', |
+ 'type': 'int-enum', |
+ 'schema': { |
+ 'type': 'integer', |
+ 'enum': [ 1, 2 ], |
+ }, |
+ 'items': [ |
+ { |
+ 'name': 'AllowKeygen', |
+ 'value': 1, |
+ 'caption': '''Allow all sites to use key generation''', |
+ }, |
+ { |
+ 'name': 'BlockKeygen', |
+ 'value': 2, |
+ 'caption': '''Do not allow any site to use key generation''', |
+ }, |
+ ], |
+ 'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'], |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': 2, |
+ 'id': 313, |
+ 'caption': '''Default key generation setting''', |
+ 'tags': [], |
Ryan Sleevi
2016/01/14 22:09:34
'system-security', 'website-sharing', 'local-data-
svaldez
2016/01/14 22:12:06
Done.
|
+ 'desc': '''Allows you to set whether websites are allowed to use key generation. Using key generation can be either allowed for all websites or denied for all websites. |
+ |
+ If this policy is left not set, 'BlockKeygen' will be used and the user will be able to change it.''', |
+ }, |
+ { |
'name': 'AutoSelectCertificateForUrls', |
'type': 'list', |
'schema': { |
@@ -3234,6 +3266,46 @@ |
If this policy is left not set the global default value will be used for all sites either from the 'DefaultJavaScriptSetting' policy if it is set, or the user's personal configuration otherwise.''', |
}, |
{ |
+ 'name': 'KeygenAllowedForUrls', |
+ 'type': 'list', |
+ 'schema': { |
+ 'type': 'array', |
+ 'items': { 'type': 'string' }, |
+ }, |
+ 'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'], |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': ['https://www.example.com', '[*.]example.edu'], |
+ 'id': 314, |
+ 'caption': '''Allow key generation on these sites''', |
+ 'tags': [], |
Ryan Sleevi
2016/01/14 22:09:34
'system-security', 'website-sharing', 'local-data-
svaldez
2016/01/14 22:12:06
Done.
|
+ 'desc': '''Allows you to set a list of url patterns that specify sites which are allowed to use key generation. |
+ |
+ If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.''', |
+ }, |
+ { |
+ 'name': 'KeygenBlockedForUrls', |
+ 'type': 'list', |
+ 'schema': { |
+ 'type': 'array', |
+ 'items': { 'type': 'string' }, |
+ }, |
+ 'supported_on': ['chrome.*:49-', 'chrome_os:49-', 'android:49-', 'ios:49-'], |
+ 'features': { |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': ['https://www.example.com', '[*.]example.edu'], |
+ 'id': 315, |
+ 'caption': '''Block key generation on these sites''', |
+ 'tags': [], |
Ryan Sleevi
2016/01/14 22:09:34
'system-security', 'website-sharing', 'local-data-
svaldez
2016/01/14 22:12:06
Done.
|
+ 'desc': '''Allows you to set a list of url patterns that specify sites which are not allowed to use key generation. |
+ |
+ If this policy is left not set the global default value will be used for all sites either from the 'DefaultKeygenSetting' policy if it is set, or the user's personal configuration otherwise.''', |
+ }, |
+ { |
'name': 'PluginsAllowedForUrls', |
'type': 'list', |
'schema': { |