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 b5c1210616fd30647e10aa711821f0ae80ff2cf4..7bb3c1665b06fa0db14fff6d5b8bf331bbf367d8 100644 |
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc |
@@ -83,6 +83,10 @@ |
#include "components/spellcheck/browser/pref_names.h" |
#endif |
+#if defined(ENABLE_PLUGINS) |
Bernhard Bauer
2016/10/14 11:49:46
Move this before ENABLE_SPELLCHECK so that the #if
pastarmovj
2016/10/14 12:38:59
Done.
|
+#include "chrome/browser/plugins/plugin_policy_handler.h" |
+#endif |
+ |
namespace policy { |
namespace { |
@@ -138,15 +142,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
{ key::kApplicationLocaleValue, |
prefs::kApplicationLocale, |
base::Value::TYPE_STRING }, |
- { key::kDisabledPlugins, |
- prefs::kPluginsDisabledPlugins, |
- base::Value::TYPE_LIST }, |
- { key::kDisabledPluginsExceptions, |
- prefs::kPluginsDisabledPluginsExceptions, |
- base::Value::TYPE_LIST }, |
- { key::kEnabledPlugins, |
- prefs::kPluginsEnabledPlugins, |
- base::Value::TYPE_LIST }, |
{ key::kAlwaysOpenPdfExternally, |
prefs::kPluginsAlwaysOpenPdfExternally, |
base::Value::TYPE_BOOLEAN }, |
@@ -932,6 +927,10 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( |
handlers->AddHandler(base::WrapUnique(new DefaultGeolocationPolicyHandler())); |
#endif // defined(OS_CHROMEOS) |
+#if defined(ENABLE_PLUGINS) |
+ handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); |
+#endif // defined(ENABLE_PLUGINS) |
+ |
return handlers; |
} |