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

webkit/glue/plugins/plugin_instance.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.
 
 // TODO: Need to deal with NPAPI's NPSavedData.
 //       I haven't seen plugins use it yet.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
 
 #include <map>
 #include <stack>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
 class MessageLoop;
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
+class WebPlugin;
+class WebPluginResourceClient;
+}
 
+namespace NPAPI
+{
 class PluginLib;
 class PluginHost;
 class PluginStream;
 class PluginStreamUrl;
 class PluginDataStream;
-class WebPlugin;
-class WebPluginResourceClient;
-
 #if defined(OS_MACOSX)
 class ScopedCurrentPluginEvent;
 #endif
 
 // A PluginInstance is an active, running instance of a Plugin.
 // A single plugin may have many PluginInstances.
 class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
  public:
   // Create a new instance of a plugin.  The PluginInstance
   // will hold a reference to the plugin.
@@ skipping 38 matching lines @@
   void set_windowless(bool value) { windowless_ = value; }
 
   // Get/Set whether this instance is transparent.
   // This only applies to windowless plugins.  Transparent
   // plugins require that webkit paint the background.
   // Default is true.
   bool transparent() { return transparent_; }
   void set_transparent(bool value) { transparent_ = value; }
 
   // Get/Set the WebPlugin associated with this instance
-  WebPlugin* webplugin() { return webplugin_; }
-  void set_web_plugin(WebPlugin* webplugin) {
+  webkit_glue::WebPlugin* webplugin() { return webplugin_; }
+  void set_web_plugin(webkit_glue::WebPlugin* webplugin) {
     webplugin_ = webplugin;
   }
 
   // Get the mimeType for this plugin stream
   const std::string &mime_type() { return mime_type_; }
 
-  PluginLib* plugin_lib() { return plugin_; }
+  NPAPI::PluginLib* plugin_lib() { return plugin_; }
 
 #if defined(OS_MACOSX)
   // Get/Set the Mac NPAPI drawing and event models
   NPDrawingModel drawing_model() { return drawing_model_; }
   void set_drawing_model(NPDrawingModel value) { drawing_model_ = value; }
   NPEventModel event_model() { return event_model_; }
   void set_event_model(NPEventModel value) { event_model_ = value; }
   // Updates the instance's tracking of the location of the plugin location
   // relative to the upper left of the screen.
   void set_plugin_origin(const gfx::Point& origin) { plugin_origin_ = origin; }
@@ skipping 23 matching lines @@
 
   // This is called when a stream is closed. We remove the stream from the
   // list, which releases the reference maintained to the stream.
   void RemoveStream(PluginStream* stream);
 
   // Closes all open streams on this instance.
   void CloseStreams();
 
   // Returns the WebPluginResourceClient object for a stream that has become
   // seekable.
-  WebPluginResourceClient* GetRangeRequest(int id);
+  webkit_glue::WebPluginResourceClient* GetRangeRequest(int id);
 
   // Have the plugin create it's script object.
   NPObject *GetPluginScriptableObject();
 
   // WebViewDelegate methods that we implement. This is for handling
   // callbacks during getURLNotify.
   void DidFinishLoadWithReason(const GURL& url, NPReason reason, int notify_id);
 
   // If true, send the Mozilla user agent instead of Chrome's to the plugin.
   bool use_mozilla_user_agent() { return use_mozilla_user_agent_; }
@@ skipping 115 matching lines @@
   // player checks:(. They crash with version 6.0.11.3088 as well. The
   // following member just adds a 96 byte padding to our PluginInstance class
   // which is passed in the ndata member. This magic number works correctly on
   // Vista with UAC on or off :(.
   // NOTE: Please dont change the ordering of the member variables
   // New members should be added after this padding array.
   // TODO(iyengar) : Disassemble the Realplayer ndata structure and look into
   // the possiblity of conforming to it (http://b/issue?id=936667). We
   // could also log a bug with Real, which would save the effort.
   uint8                                    zero_padding_[96];
-  scoped_refptr<PluginLib>                 plugin_;
+  scoped_refptr<NPAPI::PluginLib>          plugin_;
   NPP                                      npp_;
   scoped_refptr<PluginHost>                host_;
   NPPluginFuncs*                           npp_functions_;
   std::vector<scoped_refptr<PluginStream> > open_streams_;
   gfx::PluginWindowHandle                  window_handle_;
   bool                                     windowless_;
   bool                                     transparent_;
-  WebPlugin*                               webplugin_;
+  webkit_glue::WebPlugin*                  webplugin_;
   std::string                              mime_type_;
   GURL                                     get_url_;
   intptr_t                                 get_notify_data_;
   bool                                     use_mozilla_user_agent_;
 #if defined(OS_MACOSX)
   NPDrawingModel                           drawing_model_;
   NPEventModel                             event_model_;
   gfx::Point                               plugin_origin_;
   gfx::Rect                                containing_window_frame_;
   NPCocoaEvent*                            currently_handled_event_;  // weak
@@ skipping 57 matching lines @@
   }
   ~ScopedCurrentPluginEvent() {
     instance_->set_currently_handled_event(NULL);
   }
  private:
   scoped_refptr<PluginInstance> instance_;
   DISALLOW_COPY_AND_ASSIGN(ScopedCurrentPluginEvent);
 };
 #endif
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
+#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__