chrome/browser/renderer_host/render_widget_host_view_gtk.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/renderer_host/render_widget_host_view_gtk.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

« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_gtk.h ('k') | chrome/browser/renderer_host/render_widget_host_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/renderer_host/render_widget_host_view_gtk.cc

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

--- chrome/browser/renderer_host/render_widget_host_view_gtk.cc (revision 69765)

+++ chrome/browser/renderer_host/render_widget_host_view_gtk.cc (working copy)

@@ -38,9 +38,9 @@

#include "chrome/common/native_web_keyboard_event.h"

#include "gfx/gtk_preserve_window.h"

#include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"

+#include "webkit/glue/plugins/webplugin.h"

#include "webkit/glue/webaccessibility.h"

#include "webkit/glue/webcursor_gtk_data.h"

-#include "webkit/plugins/npapi/webplugin.h"

#if defined(OS_CHROMEOS)

#include "views/widget/tooltip_window_gtk.h"

@@ -587,7 +587,7 @@

}

void RenderWidgetHostViewGtk::MovePluginWindows(

- const std::vector<webkit::npapi::WebPluginGeometry>& moves) {

+ const std::vector<webkit_glue::WebPluginGeometry>& moves) {

for (size_t i = 0; i < moves.size(); ++i) {

plugin_container_manager_.MovePluginContainer(moves[i]);

}

Property changes on: chrome/browser/renderer_host/render_widget_host_view_gtk.cc

___________________________________________________________________

Deleted: svn:mergeinfo