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

Side by Side 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: Update after review. 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 unified diff | Download patch
OLDNEW
1 { 1 {
2 # policy_templates.json - Metafile for policy templates 2 # policy_templates.json - Metafile for policy templates
3 # 3 #
4 # The content of this file is evaluated as a Python expression. 4 # The content of this file is evaluated as a Python expression.
5 # 5 #
6 # This file is used as input to generate the following policy templates: 6 # This file is used as input to generate the following policy templates:
7 # ADM, ADMX+ADML, MCX/plist and html documentation. 7 # ADM, ADMX+ADML, MCX/plist and html documentation.
8 # 8 #
9 # Policy templates are user interface definitions or documents about the 9 # Policy templates are user interface definitions or documents about the
10 # policies that can be used to configure Chrome. Each policy is a name-value 10 # policies that can be used to configure Chrome. Each policy is a name-value
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 # templates and documentation. The policy definition list that Chrome sees 116 # templates and documentation. The policy definition list that Chrome sees
117 # will include policies marked with 'future'. If a WIP policy isn't meant to 117 # will include policies marked with 'future'. If a WIP policy isn't meant to
118 # be seen by the policy providers either, the 'supported_on' key should be set 118 # be seen by the policy providers either, the 'supported_on' key should be set
119 # to an empty list. 119 # to an empty list.
120 # 120 #
121 # IDs: 121 # IDs:
122 # Since a Protocol Buffer definition is generated from this file, unique and 122 # Since a Protocol Buffer definition is generated from this file, unique and
123 # persistent IDs for all fields (but not for groups!) are needed. These are 123 # persistent IDs for all fields (but not for groups!) are needed. These are
124 # specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs, 124 # specified by the 'id' keys of each policy. NEVER CHANGE EXISTING IDs,
125 # because doing so would break the deployed wire format! 125 # because doing so would break the deployed wire format!
126 # For your editing convenience: highest ID currently used: 284 126 # For your editing convenience: highest ID currently used: 285
127 # 127 #
128 # Placeholders: 128 # Placeholders:
129 # The following placeholder strings are automatically substituted: 129 # The following placeholder strings are automatically substituted:
130 # $1 -> Google Chrome / Chromium 130 # $1 -> Google Chrome / Chromium
131 # $2 -> Google Chrome OS / Chromium OS 131 # $2 -> Google Chrome OS / Chromium OS
132 # $3 -> Google Chrome Frame / Chromium Frame 132 # $3 -> Google Chrome Frame / Chromium Frame
133 # $6 is reserved for doc_writer 133 # $6 is reserved for doc_writer
134 # 134 #
135 # Device Policy: 135 # Device Policy:
136 # An additional flag device_only (optional, defaults to False) indicates 136 # An additional flag device_only (optional, defaults to False) indicates
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 'per_profile': True, 1238 'per_profile': True,
1239 }, 1239 },
1240 'deprecated': True, 1240 'deprecated': True,
1241 'example_value': True, 1241 'example_value': True,
1242 'id': 65, 1242 'id': 65,
1243 'caption': '''Clear site data on browser shutdown (deprecated)''', 1243 'caption': '''Clear site data on browser shutdown (deprecated)''',
1244 'desc': '''This policy has been retired as of <ph name="PRODUCT_NAME">$1<e x>Google Chrome</ex></ph> version 29.''', 1244 'desc': '''This policy has been retired as of <ph name="PRODUCT_NAME">$1<e x>Google Chrome</ex></ph> version 29.''',
1245 'label': '''Clear site data on browser shutdown (deprecated)''', 1245 'label': '''Clear site data on browser shutdown (deprecated)''',
1246 }, 1246 },
1247 { 1247 {
1248 'name': 'CaptivePortalAuthenticationIgnoresProxy',
1249 'type': 'main',
1250 'schema': { 'type': 'boolean' },
1251 'supported_on': ['chrome_os:41-'],
1252 'features': {
1253 'can_be_recommended': False,
1254 'dynamic_refresh': True,
1255 'per_profile': True,
1256 },
1257 'example_value': True,
1258 'default_for_enterprise_users': False,
1259 'id': 285,
1260 'caption': '''Captive portal authentication ignores proxy''',
1261 'desc': '''This policy allows <ph name="PRODUCT_OS_NAME">$2<ex>Google Chro me 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.
1262
1263 This policy only takes effect if a proxy is configured (for example throug h policy, by the user in chrome://settings, or by extensions).
1264
1265 If you enable this setting, any captive portal authentication pages will b e displayed in a separate window ignoring all proxy settings.
1266
1267 If you disable this setting or leave it unset, any captive portal authenti cation pages will be shown in a (regular) new browser tab, using the current use r's proxy settings.''',
1268 },
1269 {
1248 'name': 'Proxy', 1270 'name': 'Proxy',
1249 'type': 'group', 1271 'type': 'group',
1250 'caption': '''Proxy server''', 1272 'caption': '''Proxy server''',
1251 'desc': '''Allows you to specify the proxy server used by <ph name="PRODUC T_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy set tings. 1273 'desc': '''Allows you to specify the proxy server used by <ph name="PRODUC T_NAME">$1<ex>Google Chrome</ex></ph> and prevents users from changing proxy set tings.
1252 1274
1253 If you choose to never use a proxy server and always connect directly, all other options are ignored. 1275 If you choose to never use a proxy server and always connect directly, all other options are ignored.
1254 1276
1255 If you choose to auto detect the proxy server, all other options are ignor ed. 1277 If you choose to auto detect the proxy server, all other options are ignor ed.
1256 1278
1257 For detailed examples, visit: 1279 For detailed examples, visit:
(...skipping 5903 matching lines...) Expand 10 before | Expand all | Expand 10 after
7161 'desc': '''Text appended in parentheses next to the policies top-level con tainer to indicate that those policies are of the Recommended level''', 7183 'desc': '''Text appended in parentheses next to the policies top-level con tainer to indicate that those policies are of the Recommended level''',
7162 'text': 'Default Settings (users can override)', 7184 'text': 'Default Settings (users can override)',
7163 }, 7185 },
7164 'doc_complex_policies_on_windows': { 7186 'doc_complex_policies_on_windows': {
7165 'desc': '''Text pointing the user to a help article for complex policies o n Windows''', 7187 'desc': '''Text pointing the user to a help article for complex policies o n Windows''',
7166 'text': '''encoded as a JSON string, for details see <ph name="COMPLEX_POL ICIES_URL">http://www.chromium.org/administrators/complex-policies-on-windows<ex >http://www.chromium.org/administrators/complex-policies-on-windows</ex></ph>''' , 7188 'text': '''encoded as a JSON string, for details see <ph name="COMPLEX_POL ICIES_URL">http://www.chromium.org/administrators/complex-policies-on-windows<ex >http://www.chromium.org/administrators/complex-policies-on-windows</ex></ph>''' ,
7167 }, 7189 },
7168 }, 7190 },
7169 'placeholders': [], 7191 'placeholders': [],
7170 } 7192 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698