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

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

Issue 2858035: Modify NPAPI::PluginList::GetPluginInfo() to return true also for disabled plugins. (Closed)
Patch Set: Created 10 years, 6 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: webkit/glue/plugins/plugin_list.cc
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index 1ec170cd36e89309564e83fca6d86e1f51c6f5b0..b40b519d29cff34163d2db8c2886d880373f8cc1 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -381,13 +381,8 @@ bool PluginList::GetPluginInfo(const GURL& url,
std::string* actual_mime_type) {
bool found = FindPlugin(mime_type, allow_wildcard, info);
if (!found || (info->path.value() == kDefaultPluginLibraryName)) {
- WebPluginInfo info2;
- if (FindPlugin(url, actual_mime_type, &info2)) {
- found = true;
- *info = info2;
- } else if (FindDisabledPlugin(mime_type, allow_wildcard, &info2)) {
- found = false;
- }
+ found = FindPlugin(url, actual_mime_type, info) ||
+ FindDisabledPlugin(mime_type, allow_wildcard, info);
}
return found;

Powered by Google App Engine
This is Rietveld 408576698