| 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..64f0f1863661ad375c71f4ba8cf037fac8cc323b 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,49 @@
|
| 'label': '''Clear site data on browser shutdown (deprecated)''',
|
| },
|
| {
|
| + 'name': 'CaptivePortalAuthenticationIgnoresProxy',
|
| + 'type': 'int-enum',
|
| + 'schema': {
|
| + 'type': 'integer',
|
| + 'enum': [ 0, 1, 2 ],
|
| + },
|
| + 'items': [
|
| + {
|
| + 'name': 'False',
|
| + 'value': 0,
|
| + 'caption': '''Captive portal authentication will use current proxy settings.''',
|
| + },
|
| + {
|
| + 'name': 'True',
|
| + 'value': 1,
|
| + 'caption': '''Captive portal authentication window will ignore proxy settings.''',
|
| + },
|
| + {
|
| + 'name': 'UserDefined',
|
| + 'value': 2,
|
| + 'caption': '''Users will be able to configure this parameter.''',
|
| + },
|
| + ],
|
| + 'supported_on': ['chrome_os:41-'],
|
| + 'features': {
|
| + 'can_be_recommended': False,
|
| + 'dynamic_refresh': True,
|
| + 'per_profile': True,
|
| + },
|
| + 'example_value': 0,
|
| + 'id': 285,
|
| + 'caption': '''Captive portal authentication ignores proxy''',
|
| + 'desc': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will bypass any proxy for Captive Portal authentication.
|
| +
|
| + This policy only takes effect if proxy is configured (either through policy, or by the user in chrome://settings).
|
| +
|
| + 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.
|
| +
|
| + If you set this policy to 'UserDefined', users would be able to configure this parameter.''',
|
| + },
|
| + {
|
| 'name': 'Proxy',
|
| 'type': 'group',
|
| 'caption': '''Proxy server''',
|
|
|