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

content/renderer/webplugin_delegate_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_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
+#include "content/child/npapi/webplugin_delegate.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/surface/transport_dib.h"
 #include "url/gurl.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_MACOSX)
 #include "base/containers/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #endif
 
 struct NPObject;
 struct PluginHostMsg_URLRequest_Params;
 class SkBitmap;
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace webkit {
 namespace npapi {
 class WebPlugin;
 }
 }
 
 namespace content {
 class NPObjectStub;
 class PluginChannelHost;
 class RenderViewImpl;
 
 // An implementation of WebPluginDelegate that proxies all calls to
 // the plugin process.
 class WebPluginDelegateProxy
-    : public webkit::npapi::WebPluginDelegate,
+    : public WebPluginDelegate,
       public IPC::Listener,
       public IPC::Sender,
       public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
   WebPluginDelegateProxy(const std::string& mime_type,
                          const base::WeakPtr<RenderViewImpl>& render_view);
 
   // WebPluginDelegate implementation:
   virtual void PluginDestroyed() OVERRIDE;
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
-                          webkit::npapi::WebPlugin* plugin,
+                          WebPlugin* plugin,
                           bool load_manually) OVERRIDE;
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect) OVERRIDE;
   virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) OVERRIDE;
   virtual NPObject* GetPluginScriptableObject() OVERRIDE;
   virtual struct _NPP* GetPluginNPP() OVERRIDE;
   virtual bool GetFormValue(string16* value) OVERRIDE;
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
                                        int notify_id) OVERRIDE;
   virtual void SetFocus(bool focused) OVERRIDE;
@@ skipping 41 matching lines @@
                                     int notify_id) OVERRIDE;
 
   virtual void DidReceiveManualResponse(const GURL& url,
                                         const std::string& mime_type,
                                         const std::string& headers,
                                         uint32 expected_length,
                                         uint32 last_modified) OVERRIDE;
   virtual void DidReceiveManualData(const char* buffer, int length) OVERRIDE;
   virtual void DidFinishManualLoading() OVERRIDE;
   virtual void DidManualLoadFail() OVERRIDE;
-  virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
+  virtual WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id) OVERRIDE;
-  virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
+  virtual WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id) OVERRIDE;
 
   gfx::PluginWindowHandle GetPluginWindowHandle();
 
  protected:
   friend class base::DeleteHelper<WebPluginDelegateProxy>;
   virtual ~WebPluginDelegateProxy();
 
  private:
   struct SharedBitmap {
@@ skipping 100 matching lines @@
   // plugin window gets destroyed, or when the plugin has crashed (at which
   // point the window has already been destroyed).
   void WillDestroyWindow();
 
 #if defined(OS_WIN)
   // Returns true if we should update the plugin geometry synchronously.
   bool UseSynchronousGeometryUpdates();
 #endif
 
   base::WeakPtr<RenderViewImpl> render_view_;
-  webkit::npapi::WebPlugin* plugin_;
+  WebPlugin* plugin_;
   bool uses_shared_bitmaps_;
 #if defined(OS_MACOSX)
   bool uses_compositor_;
 #elif defined(OS_WIN)
   // Used for windowless plugins so that keyboard activation works.
   gfx::NativeViewId dummy_activation_window_;
 #endif
   gfx::PluginWindowHandle window_;
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
@@ skipping 35 matching lines @@
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_