diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/browser/hang_monitor | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 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 9b719ca..8399464 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/plugins/npapi/webplugin_delegate_impl.h" +#include "webkit/glue/plugins/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 (webkit::npapi::WebPluginDelegateImpl::GetPluginNameFromWindow( - window_to_check, plugin_name)) { + if (WebPluginDelegateImpl::GetPluginNameFromWindow(window_to_check, + plugin_name)) { return true; } window_to_check = GetParent(window_to_check); |