Index: webkit/plugins/npapi/plugin_list.cc |
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc |
index 1fae6b3252186114a752ec465ed913041e1b69a2..88bfddf801ec3d5d2676dbb258f659dfdb90e796 100644 |
--- a/webkit/plugins/npapi/plugin_list.cc |
+++ b/webkit/plugins/npapi/plugin_list.cc |
@@ -522,13 +522,12 @@ void PluginList::GetPluginInfoArray( |
std::set<FilePath> visited_plugins; |
- // Add in enabled plugins by mime type. |
+ // Add in plugins by mime type. |
for (size_t i = 0; i < plugin_groups_.size(); ++i) { |
const std::vector<WebPluginInfo>& plugins = |
plugin_groups_[i]->web_plugins_info(); |
for (size_t i = 0; i < plugins.size(); ++i) { |
- if (IsPluginEnabled(plugins[i]) && SupportsType(plugins[i], |
- mime_type, allow_wildcard)) { |
+ if (SupportsType(plugins[i], mime_type, allow_wildcard)) { |
FilePath path = plugins[i].path; |
if (path.value() != kDefaultPluginLibraryName && |
visited_plugins.insert(path).second) { |
@@ -540,7 +539,7 @@ void PluginList::GetPluginInfoArray( |
} |
} |
- // Add in enabled plugins by url. |
+ // Add in plugins by url. |
std::string path = url.path(); |
std::string::size_type last_dot = path.rfind('.'); |
if (last_dot != std::string::npos) { |
@@ -550,8 +549,7 @@ void PluginList::GetPluginInfoArray( |
const std::vector<WebPluginInfo>& plugins = |
plugin_groups_[i]->web_plugins_info(); |
for (size_t i = 0; i < plugins.size(); ++i) { |
- if (IsPluginEnabled(plugins[i]) && |
- SupportsExtension(plugins[i], extension, &actual_mime_type)) { |
+ if (SupportsExtension(plugins[i], extension, &actual_mime_type)) { |
FilePath path = plugins[i].path; |
if (path.value() != kDefaultPluginLibraryName && |
visited_plugins.insert(path).second) { |
@@ -564,24 +562,6 @@ void PluginList::GetPluginInfoArray( |
} |
} |
- // Add in disabled plugins by mime type. |
- for (size_t i = 0; i < plugin_groups_.size(); ++i) { |
- const std::vector<WebPluginInfo>& plugins = |
- plugin_groups_[i]->web_plugins_info(); |
- for (size_t i = 0; i < plugins.size(); ++i) { |
- if (!IsPluginEnabled(plugins[i]) && |
- SupportsType(plugins[i], mime_type, allow_wildcard)) { |
- FilePath path = plugins[i].path; |
- if (path.value() != kDefaultPluginLibraryName && |
- visited_plugins.insert(path).second) { |
- info->push_back(plugins[i]); |
- if (actual_mime_types) |
- actual_mime_types->push_back(mime_type); |
- } |
- } |
- } |
- } |
- |
// Add the default plugin at the end if it supports the mime type given, |
// and the default plugin is enabled. |
for (size_t i = 0; i < plugin_groups_.size(); ++i) { |