Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put

them in the webkit::npapi namespace.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 5 deletions

diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 92826e9..0fd6634 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -46,11 +46,9 @@ class WebWidget;
 struct WebPopupMenuInfo;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 struct WebPluginGeometry;
 }
-}
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
@@ -113,7 +111,7 @@ class RenderWidget : public IPC::Channel::Listener,
 
   // Called when a plugin is moved.  These events are queued up and sent with
   // the next paint or scroll message to the host.
-  void SchedulePluginMove(const webkit::npapi::WebPluginGeometry& move);
+  void SchedulePluginMove(const webkit_glue::WebPluginGeometry& move);
 
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
@@ -339,7 +337,7 @@ class RenderWidget : public IPC::Channel::Listener,
   WebKit::WebPopupType popup_type_;
 
   // Holds all the needed plugin window moves for a scroll.
-  typedef std::vector<webkit::npapi::WebPluginGeometry> WebPluginGeometryVector;
+  typedef std::vector<webkit_glue::WebPluginGeometry> WebPluginGeometryVector;
   WebPluginGeometryVector plugin_window_moves_;
 
   // A custom background for the widget.