summaryrefslogtreecommitdiffstats
path: root/webkit/support
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 13:34:05 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-30 13:34:05 +0000
commita651a3894ea39c788ac42e337b4abb5dd155e0fb (patch)
tree40a97130b154af29eeb84c05b09759bc26d32840 /webkit/support
parent23497d05d17671913682664b866824d0b09f30e4 (diff)
downloadchromium_src-a651a3894ea39c788ac42e337b4abb5dd155e0fb.zip
chromium_src-a651a3894ea39c788ac42e337b4abb5dd155e0fb.tar.gz
chromium_src-a651a3894ea39c788ac42e337b4abb5dd155e0fb.tar.bz2
Modify NPAPI::PluginList::GetPluginInfo() to return true also for disabled plugins.
GetPluginInfo() now returns true if the plugin is found, whether it's enabled or not. To find out whether the plugin is enabled, check the enabled flag in the WebPluginInfo struct output parameter. This enables getting information about disabled plugins. TEST=none BUG=none Review URL: http://codereview.chromium.org/2858035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support')
-rw-r--r--webkit/support/webkit_support.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/support/webkit_support.cc b/webkit/support/webkit_support.cc
index 77237cc..f2ff347 100644
--- a/webkit/support/webkit_support.cc
+++ b/webkit/support/webkit_support.cc
@@ -176,7 +176,7 @@ WebPlugin* CreateWebPlugin(WebFrame* frame,
std::string actual_mime_type;
if (!NPAPI::PluginList::Singleton()->GetPluginInfo(
params.url, params.mimeType.utf8(), kAllowWildcard, &info,
- &actual_mime_type)) {
+ &actual_mime_type) || !info.enabled) {
return NULL;
}