diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 12:26:04 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 12:26:04 +0000 |
| commit | 40af255e31ab46e10eeb354df4f5ff9b27bcb4f3 (patch) | |
| tree | a2f7100dce4109a4c95de582400442473618a496 | |
| parent | dd0c175cd1a6a96ed2cad1c581f489135e950218 (diff) | |
| download | chromium_src-40af255e31ab46e10eeb354df4f5ff9b27bcb4f3.zip chromium_src-40af255e31ab46e10eeb354df4f5ff9b27bcb4f3.tar.gz chromium_src-40af255e31ab46e10eeb354df4f5ff9b27bcb4f3.tar.bz2 | |
Merge 262562 "Rename the QuickCheckEnabled policy to WPADQuickCh..."
> Rename the QuickCheckEnabled policy to WPADQuickCheckEnabled.
>
> The current name is too generic and the server team asked to have a
> more specific name.
>
> Usually it's not possible to rename policies, but this one hasn't
> gone to stable yet. This change must be merged to 35 or reverted.
>
> BUG=361257
>
> Review URL: https://codereview.chromium.org/227383005
TBR=joaodasilva@chromium.org
Review URL: https://codereview.chromium.org/238573006
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@263816 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/policy/configuration_policy_handler_list_factory.cc | 2 | ||||
| -rw-r--r-- | chrome/test/data/policy/policy_test_cases.json | 4 | ||||
| -rw-r--r-- | components/policy/resources/policy_templates.json | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 20219a1..abb98ea 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -86,7 +86,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { { key::kBuiltInDnsClientEnabled, prefs::kBuiltInDnsClientEnabled, base::Value::TYPE_BOOLEAN }, - { key::kQuickCheckEnabled, + { key::kWPADQuickCheckEnabled, prefs::kQuickCheckEnabled, base::Value::TYPE_BOOLEAN }, { key::kDisableSpdy, diff --git a/chrome/test/data/policy/policy_test_cases.json b/chrome/test/data/policy/policy_test_cases.json index 9d0fd3b..f2976ad 100644 --- a/chrome/test/data/policy/policy_test_cases.json +++ b/chrome/test/data/policy/policy_test_cases.json @@ -1530,9 +1530,9 @@ ] }, - "QuickCheckEnabled": { + "WPADQuickCheckEnabled": { "os": ["win", "linux", "mac", "chromeos"], - "test_policy": { "QuickCheckEnabled": true }, + "test_policy": { "WPADQuickCheckEnabled": true }, "pref_mappings": [ { "pref": "proxy.quick_check_enabled", "local_state": true diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json index 8e7b1fb..732e19f 100644 --- a/components/policy/resources/policy_templates.json +++ b/components/policy/resources/policy_templates.json @@ -309,7 +309,7 @@ If this policy is left not set, this will be enabled but the user will be able to change it.''', }, { - 'name': 'QuickCheckEnabled', + 'name': 'WPADQuickCheckEnabled', 'type': 'main', 'schema': { 'type': 'boolean' }, 'supported_on': [ 'chrome.*:35-', 'chrome_os:35-' ], |