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

chrome/plugin/webplugin_proxy.h

Index: chrome/plugin/webplugin_proxy.h
diff --git a/chrome/plugin/webplugin_proxy.h b/chrome/plugin/webplugin_proxy.h
index 66b396cb1150cfc9787eb9f78f66200146bfc7f7..2a1f1aee2d9115a4bfaf59ff005f8c4a5f45c588 100644
--- a/chrome/plugin/webplugin_proxy.h
+++ b/chrome/plugin/webplugin_proxy.h
@@ -24,17 +24,23 @@
 #include "chrome/common/chrome_plugin_api.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
-#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/plugins/npapi/webplugin.h"
 
 class PluginChannel;
+
+namespace webkit {
+namespace npapi {
 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_glue::WebPlugin {
+class WebPluginProxy : public webkit::npapi::WebPlugin {
  public:
   // Creates a new proxy for WebPlugin, using the given sender to send the
   // marshalled WebPlugin calls.
@@ -45,7 +51,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
                  int host_render_view_routing_id);
   ~WebPluginProxy();
 
-  void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
+  void set_delegate(webkit::npapi::WebPluginDelegateImpl* d) { delegate_ = d; }
 
   // WebPlugin overrides
   virtual void SetWindow(gfx::PluginWindowHandle window);
@@ -93,7 +99,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
 
   // Returns a WebPluginResourceClient object given its id, or NULL if no
   // object with that id exists.
-  webkit_glue::WebPluginResourceClient* GetResourceClient(int id);
+  webkit::npapi::WebPluginResourceClient* GetResourceClient(int id);
 
   // Returns the id of the renderer that contains this plugin.
   int GetRendererId();
@@ -111,7 +117,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
 
   // Notification received on a plugin issued resource request creation.
   void OnResourceCreated(int resource_id,
-                         webkit_glue::WebPluginResourceClient* client);
+                         webkit::npapi::WebPluginResourceClient* client);
 
   virtual void HandleURLRequest(const char* url,
                                 const char* method,
@@ -137,7 +143,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
   virtual void SetDeferResourceLoading(unsigned long resource_id, bool defer);
   virtual bool IsOffTheRecord();
   virtual void ResourceClientDeleted(
-      webkit_glue::WebPluginResourceClient* resource_client);
+      webkit::npapi::WebPluginResourceClient* resource_client);
   gfx::NativeViewId containing_window() { return containing_window_; }
 
 #if defined(OS_MACOSX)
@@ -145,7 +151,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
 
   virtual void BindFakePluginWindowHandle(bool opaque);
 
-  virtual webkit_glue::WebPluginAcceleratedSurface* GetAcceleratedSurface();
+  virtual webkit::npapi::WebPluginAcceleratedSurface* GetAcceleratedSurface();
 
   // Tell the browser (via the renderer) to invalidate because the
   // accelerated buffers have changed.
@@ -189,7 +195,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
                            const TransportDIB::Handle& background_buffer,
                            const gfx::Rect& window_rect);
 
-  typedef base::hash_map<int, webkit_glue::WebPluginResourceClient*>
+  typedef base::hash_map<int, webkit::npapi::WebPluginResourceClient*>
       ResourceClientMap;
   ResourceClientMap resource_clients_;
 
@@ -198,7 +204,7 @@ class WebPluginProxy : public webkit_glue::WebPlugin {
   uint32 cp_browsing_context_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
-  WebPluginDelegateImpl* delegate_;
+  webkit::npapi::WebPluginDelegateImpl* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   gfx::NativeViewId containing_window_;