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

Unified Diff: chrome/app/policy/policy_templates.json

Issue 8555012: Fix CrOS supported_on entries in policy_templates.json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address feedback. Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/policy/policy_templates.json
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json
index 0f5a07726dd78c30b1e183b751dcf9c15a76f36f..f8d8af5d62bd941b8a94fe87248ff4244198f1b9 100644
--- a/chrome/app/policy/policy_templates.json
+++ b/chrome/app/policy/policy_templates.json
@@ -248,7 +248,7 @@
{
'name': 'DisabledSchemes',
'type': 'list',
- 'supported_on': ['chrome.*:12-', 'chrome_os:0.11-'],
+ 'supported_on': ['chrome.*:12-', 'chrome_os:0.12-'],
'features': {'dynamic_refresh': 1},
'example_value': ['file', 'mailto'],
'id': 85,
@@ -429,7 +429,7 @@
{
'name': 'MetricsReportingEnabled',
'type': 'main',
- 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
+ 'supported_on': ['chrome.*:8-'],
'features': {'dynamic_refresh': 0},
'example_value': True,
'id': 15,
@@ -514,7 +514,7 @@
{
'name': 'EnabledPlugins',
'type': 'list',
- 'supported_on': ['chrome.*:11-'],
+ 'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': ['Java', 'Shockwave Flash', 'Chrome PDF Viewer'],
'id': 78,
@@ -531,7 +531,7 @@
{
'name': 'DisabledPluginsExceptions',
'type': 'list',
- 'supported_on': ['chrome.*:11-'],
+ 'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': ['Java', 'Shockwave Flash', 'Chrome PDF Viewer'],
'id': 79,
@@ -608,7 +608,7 @@
{
'name': 'ClearSiteDataOnExit',
'type': 'main',
- 'supported_on': ['chrome.*:11-', 'chrome_os:1.0-'],
+ 'supported_on': ['chrome.*:11-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': True,
'id': 65,
@@ -663,7 +663,7 @@
'caption': '''Use system proxy settings'''
},
],
- 'supported_on': ['chrome.*:10-'],
+ 'supported_on': ['chrome.*:10-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': 'direct',
'id': 21,
@@ -708,7 +708,7 @@
'caption': '''Use system proxy settings'''
},
],
- 'supported_on': ['chrome.*:8-'],
+ 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'deprecated': True,
'example_value': 2,
@@ -732,7 +732,7 @@
{
'name': 'ProxyServer',
'type': 'string',
- 'supported_on': ['chrome.*:8-'],
+ 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': '123.123.123.123:8080',
'id': 23,
@@ -747,7 +747,7 @@
{
'name': 'ProxyPacUrl',
'type': 'string',
- 'supported_on': ['chrome.*:8-'],
+ 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': 'http://internal.site/example.pac',
'id': 24,
@@ -762,7 +762,7 @@
{
'name': 'ProxyBypassList',
'type': 'string',
- 'supported_on': ['chrome.*:8-'],
+ 'supported_on': ['chrome.*:8-', 'chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': 'http://www.example1.com,http://www.example2.com,http://internalsite/',
'id': 25,
@@ -1444,7 +1444,7 @@
{
'name': 'PolicyRefreshRate',
'type': 'int',
- 'supported_on': ['chrome_os:1.0-'],
+ 'supported_on': ['chrome_os:0.11-'],
'features': {'dynamic_refresh': 1},
'example_value': 3600000,
'id': 56,
@@ -1567,7 +1567,7 @@
{
'name': 'TranslateEnabled',
'type': 'main',
- 'supported_on': ['chrome.*:12-', 'chrome_os:0.11-'],
+ 'supported_on': ['chrome.*:12-', 'chrome_os:0.12-'],
'features': {'dynamic_refresh': 1},
'example_value': True,
'id': 80,
@@ -1583,7 +1583,7 @@
{
'name': 'AllowOutdatedPlugins',
'type': 'main',
- 'supported_on': ['chrome.*:12-', 'chrome_os:0.11-'],
+ 'supported_on': ['chrome.*:12-', 'chrome_os:0.12-'],
'features': {'dynamic_refresh': 1},
'example_value': True,
'id': 81,
@@ -1672,7 +1672,7 @@
{
'name': 'DevicePolicyRefreshRate',
'type': 'int',
- 'supported_on': ['chrome_os:1.0-'],
+ 'supported_on': ['chrome_os:0.11-'],
'device_only': True,
'features': {'dynamic_refresh': 1},
'example_value': 3600000,
@@ -1702,7 +1702,7 @@
'caption': '''Dev channel (may be unstable)'''
}
],
- 'supported_on': ['chrome_os:1.0-'],
+ 'supported_on': ['chrome_os:0.11-'],
'device_only': True,
'features': {'dynamic_refresh': 1},
'example_value': 'stable-channel',
@@ -1768,7 +1768,7 @@
{
'name': 'MaxConnectionsPerProxy',
'type': 'int',
- 'supported_on': ['chrome_os:1.0-','chrome.*:14-'],
+ 'supported_on': ['chrome.*:14-','chrome_os:0.14-'],
'features': {'dynamic_refresh': 0},
'example_value': 32,
'id': 92,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698