Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/renderer/render_widget.h

 // Copyright (c) 2012 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 CONTENT_RENDERER_RENDER_WIDGET_H_
 #define CONTENT_RENDERER_RENDER_WIDGET_H_
 
 #include <deque>
 #include <map>
 
@@ skipping 47 matching lines @@
 struct WebRenderingStatsImpl;
 }
 
 namespace cc { class OutputSurface; }
 
 namespace ui {
 class Range;
 }
 
 namespace webkit {
-namespace npapi {
-struct WebPluginGeometry;
-}  // namespace npapi
-
 namespace ppapi {
 class PluginInstance;
 }  // namespace ppapi
 }  // namespace webkit
 
 namespace content {
-struct GpuRenderingStats;
 class RenderWidgetCompositor;
 class RenderWidgetTest;
+struct GpuRenderingStats;
+struct WebPluginGeometry;
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
 class CONTENT_EXPORT RenderWidget
     : public IPC::Listener,
       public IPC::Sender,
       NON_EXPORTED_BASE(virtual public WebKit::WebWidgetClient),
       NON_EXPORTED_BASE(public WebGraphicsContext3DSwapBuffersClient),
       public base::RefCounted<RenderWidget> {
  public:
@@ skipping 64 matching lines @@
   virtual WebKit::WebRect windowResizerRect();
   virtual WebKit::WebRect rootWindowRect();
   virtual WebKit::WebScreenInfo screenInfo();
   virtual float deviceScaleFactor();
   virtual void resetInputMethod();
   virtual void didHandleGestureEvent(const WebKit::WebGestureEvent& event,
                                      bool event_cancelled);
 
   // 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 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);
 
   // Fills in a WebRenderingStatsImpl struct containing information about
   // rendering, e.g. count of frames rendered, time spent painting.
   void GetRenderingStats(WebKit::WebRenderingStatsImpl&) const;
 
   // Fills in a GpuRenderingStats struct containing information about
@@ skipping 474 matching lines @@
   // Stores the current composition character bounds.
   std::vector<gfx::Rect> composition_character_bounds_;
 
   // Stores the current composition range.
   ui::Range composition_range_;
 
   // 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::npapi::WebPluginGeometry> WebPluginGeometryVector;
+  typedef std::vector<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_;
 
@@ skipping 53 matching lines @@
   ui::LatencyInfo latency_info_;
 
   base::WeakPtrFactory<RenderWidget> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidget);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_RENDER_WIDGET_H_