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

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: Created 6 years 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..36de94bcc2d9296a6b7d99b28798fe32de984ae8 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,51 @@
'label': '''Clear site data on browser shutdown (deprecated)''',
},
{
+ 'name': 'CaptivePortalAuthenticationIgnoresProxy',
bartfab (slow) 2014/12/19 12:08:54 We have a group for proxy settings. Please move th
Alexander Alekseev 2014/12/22 22:20:11 I've moved it out of this group, because group des
+ 'type': 'int-enum',
+ 'schema': {
+ 'type': 'integer',
+ 'enum': [ 0, 1, 2 ],
+ },
+ 'items': [
+ {
+ 'name': 'False',
+ 'value': 0,
+ 'caption': '''Captive portal authernication will use current proxy settings''',
bartfab (slow) 2014/12/19 12:08:54 Nit: s/authernication/authentication/
Alexander Alekseev 2014/12/22 22:20:12 Done.
+ },
+ {
+ 'name': 'True',
+ 'value': 1,
+ 'caption': '''Captive portal authernication window will ignore proxy settings''',
bartfab (slow) 2014/12/19 12:08:54 Nit: s/authernication/authentication/
Alexander Alekseev 2014/12/22 22:20:11 Done.
+ },
+ {
+ 'name': 'UserDefined',
+ 'value': 2,
+ 'caption': '''Users will be able to configure this parameter in about:flags''',
bartfab (slow) 2014/12/19 12:08:54 about:flags is not meant to be a place where you t
Alexander Alekseev 2014/12/22 22:20:11 Done.
+ },
+ ],
+ 'supported_on': ['chrome_os:41-'],
+ 'features': {
+ 'can_be_recommended': False,
bartfab (slow) 2014/12/19 12:08:54 Your option 2 is semantically very close to a reco
Alexander Alekseev 2014/12/22 22:20:11 As far, as I understand discussion in https://docs
+ 'dynamic_refresh': True,
+ 'per_profile': True,
+ },
+ 'example_value': 0,
+ 'id': 285,
+ 'caption': '''Captive Portal Authentication Ignores Proxy''',
bartfab (slow) 2014/12/19 12:08:54 Nit: Please use regular capitalization, not title
Alexander Alekseev 2014/12/22 22:20:11 Done.
+ '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 in domain policy, or by user in chrome:settings).
bartfab (slow) 2014/12/19 12:08:54 Nit 1: s/in domain/through/ Nit 2: s/by/by the/ Ni
Alexander Alekseev 2014/12/22 22:20:11 Done.
+
+ If you enable this setting, captive portal authentication page will be displayed in a separate window ignoring all proxy settings.
bartfab (slow) 2014/12/19 12:08:54 Nit 1: s/captive/any captive/ Nit 2: s/page/pages/
Alexander Alekseev 2014/12/22 22:20:11 Done.
+
+ If you disable this setting, captive portal authentication page will be shown in a (regular) new browser tab.
bartfab (slow) 2014/12/19 12:08:54 Nit 1: s/captive/any captive/ Nit 2: s/page/pages/
Alexander Alekseev 2014/12/22 22:20:11 Done.
+
+ If you set this policy to 'UserDefined', users would be able to configure this parameter in about:flags.
bartfab (slow) 2014/12/19 12:08:54 As discussed above, this should be handled via rec
Alexander Alekseev 2014/12/22 22:20:11 Done.
+
+ Leaving this policy not set eaquals to 'False' policy value.''',
bartfab (slow) 2014/12/19 12:08:54 Nit 1: s/eaquals/equals/ Nit 2: You can fold this
Alexander Alekseev 2014/12/22 22:20:11 Done.
+ },
+ {
'name': 'Proxy',
'type': 'group',
'caption': '''Proxy server''',

Powered by Google App Engine
This is Rietveld 408576698