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

chrome/renderer/render_widget.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_RENDERER_RENDER_WIDGET_H_
 #define CHROME_RENDERER_RENDER_WIDGET_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 28 matching lines @@
 namespace skia {
 class PlatformCanvas;
 }
 
 namespace WebKit {
 class WebMouseEvent;
 class WebWidget;
 struct WebPopupMenuInfo;
 }
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
 struct WebPluginGeometry;
 }
+}
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class RenderWidget : public IPC::Channel::Listener,
                      public IPC::Message::Sender,
                      virtual public WebKit::WebWidgetClient,
                      public base::RefCounted<RenderWidget> {
  public:
   // Creates a new RenderWidget.  The opener_id is the routing ID of the
   // RenderView that this widget lives inside. The render_thread is any
@@ skipping 42 matching lines @@
   virtual void runModal() {}
   virtual WebKit::WebRect windowRect();
   virtual void setWindowRect(const WebKit::WebRect&);
   virtual WebKit::WebRect windowResizerRect();
   virtual WebKit::WebRect rootWindowRect();
   virtual WebKit::WebScreenInfo screenInfo();
   virtual void resetInputMethod();
 
   // 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_glue::WebPluginGeometry& move);
+  void SchedulePluginMove(const webkit::npapi::WebPluginGeometry& move);
 
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
   void CleanupWindowInPluginMoves(gfx::PluginWindowHandle window);
 
   // Close the underlying WebWidget.
   virtual void Close();
 
  protected:
   // Friend RefCounted so that the dtor can be non-public. Using this class
@@ skipping 205 matching lines @@
   // Stores the current text input type of |webwidget_|.
   WebKit::WebTextInputType text_input_type_;
 
   // Stores the current caret bounds of input focus.
   WebKit::WebRect caret_bounds_;
 
   // The kind of popup this widget represents, NONE if not a popup.
   WebKit::WebPopupType popup_type_;
 
   // Holds all the needed plugin window moves for a scroll.
-  typedef std::vector<webkit_glue::WebPluginGeometry> WebPluginGeometryVector;
+  typedef std::vector<webkit::npapi::WebPluginGeometry> WebPluginGeometryVector;
   WebPluginGeometryVector plugin_window_moves_;
 
   // A custom background for the widget.
   SkBitmap background_;
 
   // While we are waiting for the browser to update window sizes,
   // we track the pending size temporarily.
   int pending_window_rect_count_;
   WebKit::WebRect pending_window_rect_;
 
   scoped_ptr<IPC::Message> pending_input_event_ack_;
 
   // Indicates if the next sequence of Char events should be suppressed or not.
   bool suppress_next_char_events_;
 
   // Set to true if painting to the window is handled by the accelerated
   // compositor.
   bool is_accelerated_compositing_active_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 #endif  // CHROME_RENDERER_RENDER_WIDGET_H_