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

Unified Diff: webkit/plugins/npapi/plugin_list.cc

Issue 7387010: Add PluginServiceFilter interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test Created 9 years, 4 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 | « content/renderer/webplugin_delegate_proxy.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 3f3e4e0876bc1d65b7f8a38bc75a8a9cd976865c..45160fcaa32578073940d6873064738c0ac6f147 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -519,13 +519,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<webkit::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) {
@@ -537,7 +536,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) {
@@ -547,8 +546,7 @@ void PluginList::GetPluginInfoArray(
const std::vector<webkit::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) {
@@ -561,24 +559,6 @@ void PluginList::GetPluginInfoArray(
}
}
- // Add in disabled plugins by mime type.
- for (size_t i = 0; i < plugin_groups_.size(); ++i) {
- const std::vector<webkit::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) {
« no previous file with comments | « content/renderer/webplugin_delegate_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698