Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/webplugin_delegate_impl.h

Index: webkit/plugins/npapi/webplugin_delegate_impl.h
===================================================================
--- webkit/plugins/npapi/webplugin_delegate_impl.h	(revision 0)
+++ webkit/plugins/npapi/webplugin_delegate_impl.h	(working copy)
@@ -2,11 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_
-#define WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
+#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
-#include "build/build_config.h"
-
 #include <string>
 #include <list>
 
@@ -15,10 +13,11 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "build/build_config.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
-#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/plugins/npapi/webplugin_delegate.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(USE_X11)
@@ -29,10 +28,6 @@
 
 class FilePath;
 
-namespace NPAPI {
-class PluginInstance;
-}
-
 namespace WebKit {
 class WebMouseEvent;
 }
@@ -49,14 +44,20 @@
 class CALayer;
 class CARenderer;
 #endif
-namespace webkit_glue {
+#endif
+
+namespace webkit {
+namespace npapi {
+
+class PluginInstance;
+
+#if defined(OS_MACOSX)
 class WebPluginAcceleratedSurface;
-}
 #endif
 
 // An implementation of WebPluginDelegate that runs in the plugin process,
 // proxied from the renderer by WebPluginDelegateProxy.
-class WebPluginDelegateImpl : public webkit_glue::WebPluginDelegate {
+class WebPluginDelegateImpl : public WebPluginDelegate {
  public:
   enum PluginQuirks {
     PLUGIN_QUIRK_SETWINDOW_TWICE = 1,  // Win32
@@ -94,7 +95,7 @@
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
-                          webkit_glue::WebPlugin* plugin,
+                          WebPlugin* plugin,
                           bool load_manually);
   virtual void PluginDestroyed();
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
@@ -121,9 +122,9 @@
   virtual void DidFinishManualLoading();
   virtual void DidManualLoadFail();
   virtual void InstallMissingPlugin();
-  virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
+  virtual WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id);
-  virtual webkit_glue::WebPluginResourceClient* CreateSeekableResourceClient(
+  virtual WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id);
   // End of WebPluginDelegate implementation.
 
@@ -194,10 +195,10 @@
 
  private:
   friend class DeleteTask<WebPluginDelegateImpl>;
-  friend class webkit_glue::WebPluginDelegate;
+  friend class WebPluginDelegate;
 
   WebPluginDelegateImpl(gfx::PluginWindowHandle containing_view,
-                        NPAPI::PluginInstance *instance);
+                        PluginInstance *instance);
   ~WebPluginDelegateImpl();
 
   // Called by Initialize() for platform-specific initialization.
@@ -273,7 +274,7 @@
   bool PlatformHandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor_info);
 
-  NPAPI::PluginInstance* instance() { return instance_.get(); }
+  PluginInstance* instance() { return instance_.get(); }
 
   // Closes down and destroys our plugin instance.
   void DestroyInstance();
@@ -292,8 +293,8 @@
   // used by windowed and windowless plugins
   bool windowless_;
 
-  webkit_glue::WebPlugin* plugin_;
-  scoped_refptr<NPAPI::PluginInstance> instance_;
+  WebPlugin* plugin_;
+  scoped_refptr<PluginInstance> instance_;
 
 #if defined(OS_WIN)
   // Original wndproc before we subclassed.
@@ -429,7 +430,7 @@
 #endif
 
   CALayer* layer_;  // Used for CA drawing mode. Weak, retained by plug-in.
-  webkit_glue::WebPluginAcceleratedSurface* surface_;  // Weak ref.
+  WebPluginAcceleratedSurface* surface_;  // Weak ref.
   CARenderer* renderer_;  // Renders layer_ to surface_.
   scoped_ptr<base::RepeatingTimer<WebPluginDelegateImpl> > redraw_timer_;
 
@@ -508,4 +509,7 @@
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_WEBPLUGIN_DELEGATE_IMPL_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_