diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 18:31:10 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-28 18:31:10 +0000 |
| commit | 9dd9aad0ccac2c0cf2871adeb7a263c5a175049d (patch) | |
| tree | 49b8a4ad65ddfad1f5c1cb3c85aca5da37feab3a /chrome/browser/policy | |
| parent | c4c508626ac9f7a6391dd4ef8542fc587cc6d4ef (diff) | |
| download | chromium_src-9dd9aad0ccac2c0cf2871adeb7a263c5a175049d.zip chromium_src-9dd9aad0ccac2c0cf2871adeb7a263c5a175049d.tar.gz chromium_src-9dd9aad0ccac2c0cf2871adeb7a263c5a175049d.tar.bz2 | |
Revert 107748 - Add policy for blocking GCP printing.
BUG=101389
TEST=On any platform use the appropriate policy mechanism to set CloudPrintSubmitEnabled to false. Cloud print should no longer be available via built in print mechanisms
Review URL: http://codereview.chromium.org/8395007
TBR=abodenha@chromium.org
Review URL: http://codereview.chromium.org/8416047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
5 files changed, 4 insertions, 16 deletions
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 4767655..1b8e3e0 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -371,10 +371,7 @@ INSTANTIATE_TEST_CASE_P( testing::Values( ValueTestParams::ForIntegerPolicy( kPolicyPolicyRefreshRate, - key::kPolicyRefreshRate), - ValueTestParams::ForBooleanPolicy( - kPolicyCloudPrintSubmitEnabled, - key::kCloudPrintSubmitEnabled)); + key::kPolicyRefreshRate))); #endif } // namespace policy diff --git a/chrome/browser/policy/configuration_policy_handler.cc b/chrome/browser/policy/configuration_policy_handler.cc index 5d4b252..dea02398 100644 --- a/chrome/browser/policy/configuration_policy_handler.cc +++ b/chrome/browser/policy/configuration_policy_handler.cc @@ -443,8 +443,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { prefs::kRemoteAccessHostFirewallTraversal }, { Value::TYPE_BOOLEAN, kPolicyCloudPrintProxyEnabled, prefs::kCloudPrintProxyEnabled }, - { Value::TYPE_BOOLEAN, kPolicyCloudPrintSubmitEnabled, - prefs::kCloudPrintSubmitEnabled }, { Value::TYPE_BOOLEAN, kPolicyTranslateEnabled, prefs::kEnableTranslate }, { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins, prefs::kPluginsAllowOutdated }, diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index c7ec427..17ecf826 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -210,8 +210,6 @@ INSTANTIATE_TEST_CASE_P( prefs::kRemoteAccessHostFirewallTraversal), TypeAndName(kPolicyCloudPrintProxyEnabled, prefs::kCloudPrintProxyEnabled), - TypeAndName(kPolicyCloudPrintSubmitEnabled, - prefs::kCloudPrintSubmitEnabled), TypeAndName(kPolicySavingBrowserHistoryDisabled, prefs::kSavingBrowserHistoryDisabled), TypeAndName(kPolicySavingBrowserHistoryDisabled, diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index c2f7ce4..f1dfe82 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -362,8 +362,6 @@ INSTANTIATE_TEST_CASE_P( testing::Values( PolicyTestParams::ForListPolicy( kPolicyURLWhitelist, - key::kURLWhitelist), - PolicyTestParams::ForBooleanPolicy( - kPolicyCloudPrintSubmitEnabled, - key::kCloudPrintSubmitEnabled))); + key::kURLWhitelist))); + } // namespace policy diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index 18dcc48..62f264e 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -521,9 +521,6 @@ INSTANTIATE_TEST_CASE_P( testing::Values( PolicyTestParams::ForListPolicy( kPolicyURLWhitelist, - key::kURLWhitelist), - PolicyTestParams::ForBooleanPolicy( - kPolicyCloudPrintSubmitEnabled, - key::kCloudPrintSubmitEnabled))); + key::kURLWhitelist))); } // namespace policy |