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

content/plugin/webplugin_proxy.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_PLUGIN_WEBPLUGIN_PROXY_H_
 #define CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_
 
 #include <string>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_cftyperef.h"
 #endif
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer/timer.h"
+#include "content/child/npapi/webplugin.h"
 #include "ipc/ipc_message.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "url/gurl.h"
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
 #endif
 #include "ui/gl/gpu_preference.h"
 #include "ui/surface/transport_dib.h"
-#include "webkit/plugins/npapi/webplugin.h"
-
-namespace webkit {
-namespace npapi {
-class WebPluginDelegateImpl;
-}
-}
 
 namespace content {
 class PluginChannel;
+class WebPluginDelegateImpl;
 
 #if defined(OS_MACOSX)
 class WebPluginAcceleratedSurfaceProxy;
 #endif
 
 // This is an implementation of WebPlugin that proxies all calls to the
 // renderer.
-class WebPluginProxy : public webkit::npapi::WebPlugin {
+class WebPluginProxy : public WebPlugin {
  public:
   // Creates a new proxy for WebPlugin, using the given sender to send the
   // marshalled WebPlugin calls.
   WebPluginProxy(PluginChannel* channel,
                  int route_id,
                  const GURL& page_url,
                  int host_render_view_routing_id);
   virtual ~WebPluginProxy();
 
-  void set_delegate(webkit::npapi::WebPluginDelegateImpl* d) { delegate_ = d; }
+  void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
 
   // WebPlugin overrides
   virtual void SetWindow(gfx::PluginWindowHandle window) OVERRIDE;
 
   // Whether input events should be sent to the delegate.
   virtual void SetAcceptsInputEvents(bool accepts) OVERRIDE;
 
   virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE;
 #if defined(OS_WIN)
   void SetWindowlessData(HANDLE pump_messages_event,
@@ skipping 10 matching lines @@
   virtual void SetCookie(const GURL& url,
                          const GURL& first_party_for_cookies,
                          const std::string& cookie) OVERRIDE;
   virtual std::string GetCookies(const GURL& url,
                                  const GURL& first_party_for_cookies) OVERRIDE;
 
   // class-specific methods
 
   // Returns a WebPluginResourceClient object given its id, or NULL if no
   // object with that id exists.
-  webkit::npapi::WebPluginResourceClient* GetResourceClient(int id);
+  WebPluginResourceClient* GetResourceClient(int id);
 
   // Returns the id of the renderer that contains this plugin.
   int GetRendererId();
 
   // Returns the id of the associated render view.
   int host_render_view_routing_id() const {
     return host_render_view_routing_id_;
   }
 
   // For windowless plugins, paints the given rectangle into the local buffer.
   void Paint(const gfx::Rect& rect);
 
   // Callback from the renderer to let us know that a paint occurred.
   void DidPaint();
 
   // Notification received on a plugin issued resource request creation.
-  void OnResourceCreated(int resource_id,
-                         webkit::npapi::WebPluginResourceClient* client);
+  void OnResourceCreated(int resource_id, WebPluginResourceClient* client);
 
   virtual void HandleURLRequest(const char* url,
                                 const char* method,
                                 const char* target,
                                 const char* buf,
                                 unsigned int len,
                                 int notify_id,
                                 bool popups_allowed,
                                 bool notify_redirects) OVERRIDE;
   void UpdateGeometry(const gfx::Rect& window_rect,
                       const gfx::Rect& clip_rect,
                       const TransportDIB::Handle& windowless_buffer0,
                       const TransportDIB::Handle& windowless_buffer1,
                       int windowless_buffer_index);
   virtual void CancelDocumentLoad() OVERRIDE;
   virtual void InitiateHTTPRangeRequest(
       const char* url, const char* range_info, int range_request_id) OVERRIDE;
   virtual void SetDeferResourceLoading(unsigned long resource_id,
                                        bool defer) OVERRIDE;
   virtual bool IsOffTheRecord() OVERRIDE;
   virtual void ResourceClientDeleted(
-      webkit::npapi::WebPluginResourceClient* resource_client) OVERRIDE;
+      WebPluginResourceClient* resource_client) OVERRIDE;
 
 #if defined(OS_MACOSX)
   virtual void FocusChanged(bool focused) OVERRIDE;
-
   virtual void StartIme() OVERRIDE;
-
-  virtual webkit::npapi::WebPluginAcceleratedSurface*
+  virtual WebPluginAcceleratedSurface*
       GetAcceleratedSurface(gfx::GpuPreference gpu_preference) OVERRIDE;
 
   //----------------------------------------------------------------------
   // Accelerated plugin implementation which renders via the compositor.
 
   // Tells the renderer, and from there the GPU process, that the plugin
   // is using accelerated rather than software rendering.
   virtual void AcceleratedPluginEnabledRendering() OVERRIDE;
 
   // Tells the renderer, and from there the GPU process, that the plugin
@@ skipping 69 matching lines @@
   }
 
 #if defined(USE_X11)
   XID windowless_shm_pixmap() const {
     return windowless_shm_pixmaps_[windowless_buffer_index_];
   }
 #endif
 
 #endif
 
-  typedef base::hash_map<int, webkit::npapi::WebPluginResourceClient*>
-      ResourceClientMap;
+  typedef base::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
   ResourceClientMap resource_clients_;
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
-  webkit::npapi::WebPluginDelegateImpl* delegate_;
+  WebPluginDelegateImpl* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   // Variables used for desynchronized windowless plugin painting. See note in
   // webplugin_delegate_proxy.h for how this works. The two sets of windowless_*
   // fields are for the front-buffer and back-buffer of a buffer flipping system
   // and windowless_buffer_index_ identifies which set we are using as the
   // back-buffer at any given time.
@@ skipping 17 matching lines @@
 
   // Contains the routing id of the host render view.
   int host_render_view_routing_id_;
 
   base::WeakPtrFactory<WebPluginProxy> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PLUGIN_WEBPLUGIN_PROXY_H_