diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
| commit | 191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c (patch) | |
| tree | b982048e66a62646694c16c2cb10cb7ad30d8912 /chrome/browser/hang_monitor | |
| parent | cfef856dd2ccece3cea13ccc96ac9579fd2b30b5 (diff) | |
| download | chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.zip chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.gz chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.bz2 | |
Re-land earlier patch that moves the NPAPI implementation from webkit/glue/plugins to webkit/plugins/npapi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/hang_monitor')
| -rw-r--r-- | chrome/browser/hang_monitor/hung_plugin_action.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index 8399464..9b719ca 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -12,7 +12,7 @@ #include "chrome/browser/platform_util.h" #include "chrome/common/logging_chrome.h" #include "grit/generated_resources.h" -#include "webkit/glue/plugins/webplugin_delegate_impl.h" +#include "webkit/plugins/npapi/webplugin_delegate_impl.h" HungPluginAction::HungPluginAction() : current_hung_plugin_window_(NULL) { } @@ -122,8 +122,8 @@ bool HungPluginAction::GetPluginName(HWND plugin_window, // we have gone too far. return false; } - if (WebPluginDelegateImpl::GetPluginNameFromWindow(window_to_check, - plugin_name)) { + if (webkit::npapi::WebPluginDelegateImpl::GetPluginNameFromWindow( + window_to_check, plugin_name)) { return true; } window_to_check = GetParent(window_to_check); |