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

chrome/renderer/webplugin_delegate_proxy.h

 // Copyright (c) 2010 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 CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "app/surface/transport_dib.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/weak_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message.h"
-#include "webkit/plugins/npapi/webplugininfo.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
+#include "webkit/glue/plugins/webplugininfo.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 
 #if defined(OS_MACOSX)
 #include "base/hash_tables.h"
 #include "base/linked_ptr.h"
 #endif
 
 class CommandBufferProxy;
 struct NPObject;
 class NPObjectStub;
 struct NPVariant_Param;
 class PluginChannelHost;
 struct PluginHostMsg_URLRequest_Params;
 class RenderView;
 class SkBitmap;
 
 namespace base {
 class SharedMemory;
 class WaitableEvent;
 }
 
 namespace skia {
 class PlatformCanvas;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 class WebPlugin;
 }
-}
 
 // An implementation of WebPluginDelegate that proxies all calls to
 // the plugin process.
 class WebPluginDelegateProxy
-    : public webkit::npapi::WebPluginDelegate,
+    : public webkit_glue::WebPluginDelegate,
       public IPC::Channel::Listener,
       public IPC::Message::Sender,
       public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
   WebPluginDelegateProxy(const std::string& mime_type,
                          const base::WeakPtr<RenderView>& render_view);
 
   // WebPluginDelegate implementation:
   virtual void PluginDestroyed();
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
-                          webkit::npapi::WebPlugin* plugin,
+                          webkit_glue::WebPlugin* plugin,
                           bool load_manually);
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect);
   virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect);
   virtual void Print(gfx::NativeDrawingContext context);
   virtual NPObject* GetPluginScriptableObject();
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
                                        int notify_id);
   virtual void SetFocus(bool focused);
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
@@ skipping 28 matching lines @@
 
   virtual void DidReceiveManualResponse(const GURL& url,
                                         const std::string& mime_type,
                                         const std::string& headers,
                                         uint32 expected_length,
                                         uint32 last_modified);
   virtual void DidReceiveManualData(const char* buffer, int length);
   virtual void DidFinishManualLoading();
   virtual void DidManualLoadFail();
   virtual void InstallMissingPlugin();
-  virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
+  virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id);
-  virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
+  virtual webkit_glue::WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id);
 
   CommandBufferProxy* CreateCommandBuffer();
   void DestroyCommandBuffer(CommandBufferProxy* command_buffer);
 
   gfx::PluginWindowHandle GetPluginWindowHandle();
 
  protected:
   template<class WebPluginDelegateProxy> friend class DeleteTask;
   ~WebPluginDelegateProxy();
@@ skipping 95 matching lines @@
 
   OldTransportDIBMap old_transport_dibs_;
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
   // Returns true if we should update the plugin geometry synchronously.
   bool UseSynchronousGeometryUpdates();
 #endif
 
   base::WeakPtr<RenderView> render_view_;
-  webkit::npapi::WebPlugin* plugin_;
+  webkit_glue::WebPlugin* plugin_;
   bool uses_shared_bitmaps_;
   gfx::PluginWindowHandle window_;
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
   int instance_id_;
-  webkit::npapi::WebPluginInfo info_;
+  WebPluginInfo info_;
 
   gfx::Rect plugin_rect_;
   gfx::Rect clip_rect_;
 
   NPObject* npobject_;
   base::WeakPtr<NPObjectStub> window_script_object_;
 
   // Event passed in by the plugin process and is used to decide if
   // messages need to be pumped in the NPP_HandleEvent sync call.
   scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;
@@ skipping 23 matching lines @@
   // This lets us know which portion of the backing store has been painted into.
   gfx::Rect backing_store_painted_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateProxy);
 };
 
 #endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_