chrome/browser/renderer_host/render_widget_host_view_gtk.h - Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

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.h

Issue 5996003: Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (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.h ('k') | chrome/browser/renderer_host/render_widget_host_view_gtk.cc » ('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.h

diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h

index 9f9b2e2ba43822b5cf3374ffc69676245fa8090c..2c47c01d7ecfe671d24e8f972e026078ccc32136 100644

--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h

+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h

@@ -19,8 +19,8 @@

#include "chrome/browser/renderer_host/render_widget_host_view.h"

#include "gfx/native_widget_types.h"

#include "gfx/rect.h"

-#include "webkit/glue/plugins/gtk_plugin_container_manager.h"

#include "webkit/glue/webcursor.h"

+#include "webkit/plugins/npapi/gtk_plugin_container_manager.h"

class RenderWidgetHost;

class GtkIMContextWrapper;

@@ -61,7 +61,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView,

virtual void SetSize(const gfx::Size& size);

virtual gfx::NativeView GetNativeView();

virtual void MovePluginWindows(

- const std::vector<webkit_glue::WebPluginGeometry>& moves);

+ const std::vector<webkit::npapi::WebPluginGeometry>& moves);

virtual void Focus();

virtual void Blur();

virtual bool HasFocus();

@@ -208,7 +208,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView,

scoped_ptr<GtkKeyBindingsHandler> key_bindings_handler_;

// Helper class that lets us allocate plugin containers and move them.

- GtkPluginContainerManager plugin_container_manager_;

+ webkit::npapi::GtkPluginContainerManager plugin_container_manager_;

// The size that we want the renderer to be. We keep this in a separate

// variable because resizing in GTK+ is async.