diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 13:53:10 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-12 13:53:10 +0000 |
| commit | f581df700226fef3708659aa575510e2c2663e4c (patch) | |
| tree | e7c1bb66536102db5d73785d804fd8ed25e8e81a /chrome/browser/policy | |
| parent | 3a305db06850635febc42acc54b65a93bf5739c7 (diff) | |
| download | chromium_src-f581df700226fef3708659aa575510e2c2663e4c.zip chromium_src-f581df700226fef3708659aa575510e2c2663e4c.tar.gz chromium_src-f581df700226fef3708659aa575510e2c2663e4c.tar.bz2 | |
Added EditBookmarksEnabled policy.
This just adds the policy and the preference, and some utility functions.
BUG=49604
TEST=None
Review URL: http://codereview.chromium.org/6825071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81246 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
5 files changed, 19 insertions, 4 deletions
diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 595b27d..823e1e2 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -359,6 +359,9 @@ INSTANTIATE_TEST_CASE_P( key::kAllowOutdatedPlugins), ValueTestParams::ForBooleanPolicy( kPolicyBookmarkBarEnabled, - key::kBookmarkBarEnabled))); + key::kBookmarkBarEnabled), + ValueTestParams::ForBooleanPolicy( + kPolicyEditBookmarksEnabled, + key::kEditBookmarksEnabled))); } // namespace policy diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 10ed825..f541d65 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -272,6 +272,8 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry { Value::TYPE_BOOLEAN, kPolicyBookmarkBarEnabled, prefs::kEnableBookmarkBar }, { Value::TYPE_BOOLEAN, kPolicyAllowOutdatedPlugins, prefs::kPluginsAllowOutdated }, + { Value::TYPE_BOOLEAN, kPolicyEditBookmarksEnabled, + prefs::kEditBookmarksEnabled }, #if defined(OS_CHROMEOS) { Value::TYPE_BOOLEAN, kPolicyChromeOsLockOnIdleSuspend, @@ -993,6 +995,8 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { key::kAllowOutdatedPlugins }, { kPolicyBookmarkBarEnabled, Value::TYPE_BOOLEAN, key::kBookmarkBarEnabled }, + { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, + key::kEditBookmarksEnabled }, #if defined(OS_CHROMEOS) { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index d6f5a57..47adb28 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -209,7 +209,9 @@ INSTANTIATE_TEST_CASE_P( TypeAndName(kPolicyAllowOutdatedPlugins, prefs::kPluginsAllowOutdated), TypeAndName(kPolicyBookmarkBarEnabled, - prefs::kEnableBookmarkBar))); + prefs::kEnableBookmarkBar), + TypeAndName(kPolicyEditBookmarksEnabled, + prefs::kEditBookmarksEnabled))); #if defined(OS_CHROMEOS) INSTANTIATE_TEST_CASE_P( diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index edfbdb2..9494122 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -330,6 +330,9 @@ INSTANTIATE_TEST_CASE_P( key::kAllowOutdatedPlugins), PolicyTestParams::ForBooleanPolicy( kPolicyBookmarkBarEnabled, - key::kBookmarkBarEnabled))); + key::kBookmarkBarEnabled), + PolicyTestParams::ForBooleanPolicy( + kPolicyEditBookmarksEnabled, + key::kEditBookmarksEnabled))); } // 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 9323e90..2763f15 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -488,6 +488,9 @@ INSTANTIATE_TEST_CASE_P( key::kAllowOutdatedPlugins), PolicyTestParams::ForBooleanPolicy( kPolicyBookmarkBarEnabled, - key::kBookmarkBarEnabled))); + key::kBookmarkBarEnabled), + PolicyTestParams::ForBooleanPolicy( + kPolicyEditBookmarksEnabled, + key::kEditBookmarksEnabled))); } // namespace policy |