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

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

Issue 2410113002: Add migration code for the EnabledPlugins and DisabledPlugins policies. (Closed)
Patch Set: Remove case insensitivity. Created 4 years, 2 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
« no previous file with comments | « chrome/browser/plugins/plugin_policy_handler.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..54fc9788ad65de56ca8174b2acc8a557f924677b 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -79,6 +79,10 @@
#include "extensions/common/manifest.h"
#endif
+#if defined(ENABLE_PLUGINS)
+#include "chrome/browser/plugins/plugin_policy_handler.h"
+#endif
+
#if defined(ENABLE_SPELLCHECK)
#include "components/spellcheck/browser/pref_names.h"
#endif
@@ -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;
}
« no previous file with comments | « chrome/browser/plugins/plugin_policy_handler.cc ('k') | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698