Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Unified Diff: components/policy/resources/policy_templates.json

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test and formatted browser_options.html. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..3081b6fbe4b316643cd90fc61fab84d45314d0b5 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': '''<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> will bypass any proxy for Captive Portal authentication.
bartfab (slow) 2015/01/07 17:38:43 Nit 1: This unconditional sentence makes it sound
Alexander Alekseev 2015/01/12 18:41:10 Done.
+
+ This policy only takes effect if proxy is configured (either through policy, or by the user in chrome://settings).
bartfab (slow) 2015/01/07 17:38:43 Nit 1: s/proxy/a proxy/ Nit 2: What about proxies
Alexander Alekseev 2015/01/12 18:41:10 Done.
+
+ 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.''',
bartfab (slow) 2015/01/07 17:38:43 Nit: You may want to add something like ", using t
Alexander Alekseev 2015/01/12 18:41:10 Done.
+ },
+ {
'name': 'Proxy',
'type': 'group',
'caption': '''Proxy server''',

Powered by Google App Engine
This is Rietveld 408576698