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 0864a1bea50644e07c71225bc701c707b9a71f7c..7b0024e7d164195fa322fe8026d88faf934a10dd 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/plugin_policy_handler.h" |
+#endif |
+ |
namespace policy { |
namespace { |
@@ -122,15 +126,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::kShowHomeButton, |
prefs::kShowHomeButton, |
base::Value::TYPE_BOOLEAN }, |
@@ -182,12 +177,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
{ key::kJavaScriptBlockedForUrls, |
prefs::kManagedJavaScriptBlockedForUrls, |
base::Value::TYPE_LIST }, |
- { key::kPluginsAllowedForUrls, |
- prefs::kManagedPluginsAllowedForUrls, |
- base::Value::TYPE_LIST }, |
- { key::kPluginsBlockedForUrls, |
- prefs::kManagedPluginsBlockedForUrls, |
- base::Value::TYPE_LIST }, |
{ key::kPopupsAllowedForUrls, |
prefs::kManagedPopupsAllowedForUrls, |
base::Value::TYPE_LIST }, |
@@ -493,6 +482,28 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = { |
#endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) |
}; |
+#if defined(ENABLE_PLUGINS) |
Mattias Nissler (ping if slow)
2015/04/10 08:47:15
Nice!
Will Harris
2015/04/10 18:51:23
Acknowledged.
|
+// List of policy types to preference names for plugin policies that will cause |
+// NPAPI to be re-enabled. |
Mattias Nissler (ping if slow)
2015/04/10 08:47:15
This makes it sound like these policy keys are jus
Will Harris
2015/04/10 18:51:23
Acknowledged.
|
+const PolicyToPreferenceMapEntry kNpapiPluginsPolicyMap[] = { |
+ { key::kEnabledPlugins, |
+ prefs::kPluginsEnabledPlugins, |
+ base::Value::TYPE_LIST }, |
+ { key::kDisabledPlugins, |
+ prefs::kPluginsDisabledPlugins, |
+ base::Value::TYPE_LIST }, |
+ { key::kDisabledPluginsExceptions, |
+ prefs::kPluginsDisabledPluginsExceptions, |
+ base::Value::TYPE_LIST }, |
+ { key::kPluginsAllowedForUrls, |
+ prefs::kManagedPluginsAllowedForUrls, |
+ base::Value::TYPE_LIST }, |
+ { key::kPluginsBlockedForUrls, |
+ prefs::kManagedPluginsBlockedForUrls, |
+ base::Value::TYPE_LIST }, |
+}; |
+#endif // defined(ENABLE_PLUGINS) |
+ |
#if defined(ENABLE_EXTENSIONS) |
void GetExtensionAllowedTypesMap( |
ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) { |
@@ -543,6 +554,15 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList( |
kSimplePolicyMap[i].value_type))); |
} |
+#if defined(ENABLE_PLUGINS) |
+ for (size_t i = 0; i < arraysize(kNpapiPluginsPolicyMap); ++i) { |
+ handlers->AddHandler(make_scoped_ptr(new PluginPolicyHandler( |
+ kNpapiPluginsPolicyMap[i].policy_name, |
+ kNpapiPluginsPolicyMap[i].preference_path, |
+ kNpapiPluginsPolicyMap[i].value_type))); |
+ } |
+#endif |
+ |
handlers->AddHandler(make_scoped_ptr(new AutofillPolicyHandler())); |
handlers->AddHandler(make_scoped_ptr(new DefaultSearchPolicyHandler())); |
handlers->AddHandler(make_scoped_ptr(new IncognitoModePolicyHandler())); |