| 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 a4b1ffa9deb13b446c114dbd610b2f942ea5679e..6417f09d0369079d9c2e5e6dd0a349e2b95549e0 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
|
| @@ -61,6 +61,10 @@
|
| #include "extensions/common/manifest.h"
|
| #endif
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| +#include "chrome/browser/plugins/enable_npapi_plugins_policy_handler.h"
|
| +#endif
|
| +
|
| namespace policy {
|
|
|
| namespace {
|
| @@ -595,6 +599,10 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
|
| new extensions::ExtensionSettingsPolicyHandler(chrome_schema)));
|
| #endif
|
|
|
| +#if defined(ENABLE_PLUGINS)
|
| + handlers->AddHandler(make_scoped_ptr(new EnableNpapiPluginsPolicyHandler()));
|
| +#endif
|
| +
|
| #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
|
| handlers->AddHandler(make_scoped_ptr(new DiskCacheDirPolicyHandler()));
|
|
|
|
|