Index: components/policy/resources/policy_templates.json |
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json |
index 7f159c7c76b6f9208b47f88e76661cbb0e787d9a..f71f0b07aff737614d3baaa839801170fd6ae664 100644 |
--- a/components/policy/resources/policy_templates.json |
+++ b/components/policy/resources/policy_templates.json |
@@ -123,7 +123,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: 284 |
+# For your editing convenience: highest ID currently used: 285 |
# |
# Placeholders: |
# The following placeholder strings are automatically substituted: |
@@ -1245,6 +1245,28 @@ |
'label': '''Clear site data on browser shutdown (deprecated)''', |
}, |
{ |
+ 'name': 'CaptivePortalAuthenticationIgnoresProxy', |
+ 'type': 'main', |
+ 'schema': { 'type': 'boolean' }, |
+ 'supported_on': ['chrome_os:41-'], |
+ 'features': { |
+ 'can_be_recommended': False, |
+ 'dynamic_refresh': True, |
+ 'per_profile': True, |
+ }, |
+ 'example_value': True, |
+ 'default_for_enterprise_users': False, |
+ 'id': 285, |
+ 'caption': '''Captive portal authentication ignores proxy''', |
+ 'desc': '''This policy allows <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> to bypass any proxy for Captive Portal authentication. |
bartfab (slow)
2015/01/14 11:00:07
Nit: s/Captive Portal/captive portal/ (for consist
Alexander Alekseev
2015/01/16 22:51:48
Done.
|
+ |
+ This policy only takes effect if a proxy is configured (for example through policy, by the user in chrome://settings, or by extensions). |
+ |
+ If you enable this setting, any captive portal authentication pages will be displayed in a separate window ignoring all proxy settings. |
+ |
+ If you disable this setting or leave it unset, any captive portal authentication pages will be shown in a (regular) new browser tab, using the current user's proxy settings.''', |
+ }, |
+ { |
'name': 'Proxy', |
'type': 'group', |
'caption': '''Proxy server''', |