diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 08:51:47 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-01 08:51:47 +0000 |
| commit | 4daae5740fecad72a406c36b465c17e8359426d3 (patch) | |
| tree | 2ff54b572b609891512bb697c084ede2c1ae209c /webkit/glue | |
| parent | bd49af9f09124dc2442be3211995d2e2adc6964f (diff) | |
| download | chromium_src-4daae5740fecad72a406c36b465c17e8359426d3.zip chromium_src-4daae5740fecad72a406c36b465c17e8359426d3.tar.gz chromium_src-4daae5740fecad72a406c36b465c17e8359426d3.tar.bz2 | |
port webkit changeset 44066
Look for the VLC plug-in's new name.
BUG=0
TEST=no additional regtests
Review URL: http://codereview.chromium.org/113813
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl.cc b/webkit/glue/plugins/webplugin_delegate_impl.cc index 261ed7b..eba09ec 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl.cc @@ -192,6 +192,8 @@ WebPluginDelegateImpl::WebPluginDelegateImpl( filename == "nppl3260.dll") { quirks_ |= PLUGIN_QUIRK_DONT_CALL_WND_PROC_RECURSIVELY; } else if (plugin_info.name.find(L"VLC Multimedia Plugin") != + std::wstring::npos || + plugin_info.name.find(L"VLC Multimedia Plug-in") != std::wstring::npos) { // VLC hangs on NPP_Destroy if we call NPP_SetWindow with a null window // handle |