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

Unified Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort constants and merge Created 6 years, 11 months 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
Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 791b296186a7cb8b2fd541deaf8d609a72cc2be7..ebc92082063a594824f5b58812e3d6287dc1ffa0 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -25,6 +25,7 @@
#include "components/policy/core/common/policy_details.h"
#include "components/policy/core/common/policy_map.h"
#include "components/policy/core/common/policy_pref_names.h"
+#include "extensions/browser/pref_names.h"
#include "extensions/common/manifest.h"
#include "grit/component_strings.h"
#include "policy/policy_constants.h"
@@ -494,23 +495,23 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList() {
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::ExtensionListPolicyHandler(
key::kExtensionInstallWhitelist,
- prefs::kExtensionInstallAllowList,
+ extensions::pref_names::kInstallAllowList,
false)));
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::ExtensionListPolicyHandler(
key::kExtensionInstallBlacklist,
- prefs::kExtensionInstallDenyList,
+ extensions::pref_names::kInstallDenyList,
true)));
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::ExtensionInstallForcelistPolicyHandler()));
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::ExtensionURLPatternListPolicyHandler(
key::kExtensionInstallSources,
- prefs::kExtensionAllowedInstallSites)));
+ extensions::pref_names::kAllowedInstallSites)));
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new StringToIntEnumListPolicyHandler(
key::kExtensionAllowedTypes,
- prefs::kExtensionAllowedTypes,
+ extensions::pref_names::kAllowedTypes,
kExtensionAllowedTypesMap,
kExtensionAllowedTypesMap + arraysize(kExtensionAllowedTypesMap))));
#if defined(OS_CHROMEOS)
@@ -530,12 +531,12 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList() {
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::NativeMessagingHostListPolicyHandler(
key::kNativeMessagingWhitelist,
- prefs::kNativeMessagingWhitelist,
+ extensions::pref_names::kNativeMessagingWhitelist,
false)));
handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
new extensions::NativeMessagingHostListPolicyHandler(
key::kNativeMessagingBlacklist,
- prefs::kNativeMessagingBlacklist,
+ extensions::pref_names::kNativeMessagingBlacklist,
true)));
#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
« no previous file with comments | « chrome/browser/media_galleries/media_galleries_preferences.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698