chrome/browser/hang_monitor/hung_plugin_action.cc - Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/hang_monitor/hung_plugin_action.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/hang_monitor/hung_plugin_action.cc

===================================================================

--- chrome/browser/hang_monitor/hung_plugin_action.cc (revision 69765)

+++ chrome/browser/hang_monitor/hung_plugin_action.cc (working copy)

@@ -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 @@

// 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);

« no previous file with comments | « chrome/browser/gtk/content_setting_bubble_gtk.cc ('k') | chrome/browser/metrics/metrics_log.h » ('j') | no next file with comments »