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

Unified Diff: content/common/pepper_plugin_registry.cc

Issue 7848025: Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indent Created 9 years, 3 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: content/common/pepper_plugin_registry.cc
diff --git a/content/common/pepper_plugin_registry.cc b/content/common/pepper_plugin_registry.cc
index 9fb1381154893f3c6ae5867d44deb606a5214faf..5bb2f29c53a8661fe2a491c0c391ff5b05b41b85 100644
--- a/content/common/pepper_plugin_registry.cc
+++ b/content/common/pepper_plugin_registry.cc
@@ -89,22 +89,12 @@ webkit::WebPluginInfo PepperPluginInfo::ToWebPluginInfo() const {
info.desc = ASCIIToUTF16(description);
info.mime_types = mime_types;
- webkit::WebPluginInfo::EnabledStates enabled_state =
- webkit::WebPluginInfo::USER_ENABLED_POLICY_UNMANAGED;
-
- if (!enabled) {
- enabled_state =
- webkit::WebPluginInfo::USER_DISABLED_POLICY_UNMANAGED;
- }
-
- info.enabled = enabled_state;
return info;
}
PepperPluginInfo::PepperPluginInfo()
: is_internal(false),
- is_out_of_process(false),
- enabled(true) {
+ is_out_of_process(false) {
}
PepperPluginInfo::~PepperPluginInfo() {
@@ -119,7 +109,6 @@ bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
webplugin_info.type ==
webkit::WebPluginInfo::PLUGIN_TYPE_PEPPER_OUT_OF_PROCESS;
- pepper_info->enabled = webkit::IsPluginEnabled(webplugin_info);
pepper_info->path = FilePath(webplugin_info.path);
pepper_info->name = UTF16ToASCII(webplugin_info.name);
pepper_info->description = UTF16ToASCII(webplugin_info.desc);

Powered by Google App Engine
This is Rietveld 408576698