diff options
| author | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 12:13:50 +0000 |
|---|---|---|
| committer | bolian@chromium.org <bolian@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-09 12:13:50 +0000 |
| commit | 436190ec344080f89b16905dbaf5d6c6bf519f9f (patch) | |
| tree | 3eeb247aa3b3c13b16901db1eb543423934bb78b /chrome | |
| parent | 5584383a8d3c2a39c00109e87edb834a3d72a995 (diff) | |
| download | chromium_src-436190ec344080f89b16905dbaf5d6c6bf519f9f.zip chromium_src-436190ec344080f89b16905dbaf5d6c6bf519f9f.tar.gz chromium_src-436190ec344080f89b16905dbaf5d6c6bf519f9f.tar.bz2 | |
Added policy to control pref: spdy_proxy.enabled (kSpdyProxyAuthEnabled).
BUG=273830
This enables admins to turn the data compression proxy feature off through cloud policy.
Review URL: https://chromiumcodereview.appspot.com/23533032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222009 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/policy/policy_templates.json | 20 | ||||
| -rw-r--r-- | chrome/browser/policy/configuration_policy_handler_list.cc | 6 | ||||
| -rw-r--r-- | chrome/test/data/policy/policy_test_cases.json | 8 |
3 files changed, 33 insertions, 1 deletions
diff --git a/chrome/app/policy/policy_templates.json b/chrome/app/policy/policy_templates.json index 226f6f4..9dec4fd 100644 --- a/chrome/app/policy/policy_templates.json +++ b/chrome/app/policy/policy_templates.json @@ -117,7 +117,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: 240 +# For your editing convenience: highest ID currently used: 241 # # Placeholders: # The following placeholder strings are automatically substituted: @@ -5531,6 +5531,24 @@ Managed bookmarks are not synced to the user account.''', }, + { + 'name': 'DataCompressionProxyEnabled', + 'type': 'main', + 'schema': { 'type': 'boolean' }, + 'supported_on': ['android:31-'], + 'features': { + 'dynamic_refresh': True, + 'per_profile': True, + }, + 'example_value': True, + 'id': 241, + 'caption': '''Enable the data compression proxy feature''', + 'desc': '''Enable or disable the data compression proxy and prevents users from changing this setting. + + If you enable or disable this setting, users cannot change or override this setting. + + If this policy is left not set, the data compression proxy feature will be available for the user to choose whether to use it or not.''', + }, ], 'messages': { # Messages that are not associated to any policies. diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc index e17a74f..c11ca73 100644 --- a/chrome/browser/policy/configuration_policy_handler_list.cc +++ b/chrome/browser/policy/configuration_policy_handler_list.cc @@ -439,6 +439,12 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { prefs::kBackgroundModeEnabled, Value::TYPE_BOOLEAN }, #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) + +#if defined(OS_ANDROID) + { key::kDataCompressionProxyEnabled, + prefs::kSpdyProxyAuthEnabled, + Value::TYPE_BOOLEAN }, +#endif // defined(OS_ANDROID) }; // Mapping from extension type names to Manifest::Type. diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json index 78a359b..97b8abb 100644 --- a/chrome/test/data/policy/policy_test_cases.json +++ b/chrome/test/data/policy/policy_test_cases.json @@ -1537,6 +1537,14 @@ ] }, + "DataCompressionProxyEnabled": { + "os": ["android"], + "test_policy": { "DataCompressionProxyEnabled": false }, + "pref_mappings": [ + { "pref": "spdy_proxy.enabled" } + ] + }, + "----- Chrome OS policies ------------------------------------------------": {}, "ChromeOsLockOnIdleSuspend": { |