diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 14:49:31 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 14:49:31 +0000 |
| commit | 6136e63a06940dad69c24d0c3ccc34ec839020f3 (patch) | |
| tree | 0b0e0da7264200b10d0cd13479833b5529f83c64 /webkit/glue | |
| parent | 55b9d8ef1021e031bc52cbc050a43b924223be64 (diff) | |
| download | chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.zip chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.tar.gz chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.tar.bz2 | |
Fix a bug effectively disabling the default plugin.
Also, re-enable DefaultPluginUITest.DefaultPluginLoadTest.
BUG=48388,46662
TEST=DefaultPluginUITest.DefaultPluginLoadTest
Review URL: http://codereview.chromium.org/2854041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/plugin_list.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_list.cc b/webkit/glue/plugins/plugin_list.cc index b40b519..a3412d7 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; |