summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 18:23:30 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 18:23:30 +0000
commitf505c31ba55975411a009f74a59b001a5a46bb56 (patch)
tree7ba0383621e416fef3c3f6a6d37f5609947af659
parent937a4583a290d621f50c1788346584f79aab5a29 (diff)
downloadchromium_src-f505c31ba55975411a009f74a59b001a5a46bb56.zip
chromium_src-f505c31ba55975411a009f74a59b001a5a46bb56.tar.gz
chromium_src-f505c31ba55975411a009f74a59b001a5a46bb56.tar.bz2
Disable the WanWang protocol handler plugin (npww.dll) as it crashes during shutdown.
This fixes bug http://code.google.com/p/chromium/issues/detail?id=3953 Bug=3953 Review URL: http://codereview.chromium.org/20087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9224 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/glue/plugins/plugin_list_win.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_list_win.cc b/webkit/glue/plugins/plugin_list_win.cc
index cfe79a4..74da249 100644
--- a/webkit/glue/plugins/plugin_list_win.cc
+++ b/webkit/glue/plugins/plugin_list_win.cc
@@ -33,6 +33,7 @@ const TCHAR kMozillaActiveXPlugin[] = _T("npmozax.dll");
const TCHAR kNewWMPPlugin[] = _T("np-mswmp.dll");
const TCHAR kOldWMPPlugin[] = _T("npdsplay.dll");
const TCHAR kYahooApplicationStatePlugin[] = _T("npystate.dll");
+const TCHAR kWanWangProtocolHandlerPlugin[] = _T("npww.dll");
const TCHAR kRegistryJava[] =
_T("Software\\JavaSoft\\Java Runtime Environment");
const TCHAR kRegistryBrowserJavaVersion[] = _T("BrowserJavaVersion");
@@ -354,6 +355,13 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info) {
if (filename == kYahooApplicationStatePlugin)
return false;
+ // Disable the WangWang protocol handler plugin (npww.dll) as it crashes
+ // chrome during shutdown. Firefox also disables this plugin.
+ // Please refer to http://code.google.com/p/chromium/issues/detail?id=3953
+ // for more information.
+ if (filename == kWanWangProtocolHandlerPlugin)
+ return false;
+
// Special WMP handling
// We will use the ActiveX shim to handle embedded WMP media.