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

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

Issue 2854041: Fix a bug effectively disabling the default plugin. (Closed) Base URL: git://codf21.jail/chromium.git
Patch Set: Add braces. Created 10 years, 5 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/default_plugin_uitest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/plugins/plugin_list.cc
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc
index b40b519d29cff34163d2db8c2886d880373f8cc1..a3412d7402c5c4ac6f9ba878d154306b8af52934 100644
--- a/webkit/glue/plugins/plugin_list.cc
+++ b/webkit/glue/plugins/plugin_list.cc
@@ -381,8 +381,10 @@ 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)) {
- found = FindPlugin(url, actual_mime_type, info) ||
- FindDisabledPlugin(mime_type, allow_wildcard, info);
+ if (FindPlugin(url, actual_mime_type, info) ||
+ FindDisabledPlugin(mime_type, allow_wildcard, info)) {
+ found = true;
+ }
}
return found;
« no previous file with comments | « chrome/browser/default_plugin_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698