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

webkit/plugins/npapi/webplugin_delegate_impl.cc

 // 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.
 
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/plugins/plugin_constants_win.h"
-#include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/plugins/plugin_lib.h"
-#include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/plugins/npapi/plugin_constants_win.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/plugin_lib.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_stream_url.h"
 
-using webkit_glue::WebPlugin;
-using webkit_glue::WebPluginDelegate;
-using webkit_glue::WebPluginResourceClient;
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 
+namespace webkit {
+namespace npapi {
+
 WebPluginDelegateImpl* WebPluginDelegateImpl::Create(
     const FilePath& filename,
     const std::string& mime_type,
     gfx::PluginWindowHandle containing_view) {
-  scoped_refptr<NPAPI::PluginLib> plugin_lib(
-      NPAPI::PluginLib::CreatePluginLib(filename));
+  scoped_refptr<PluginLib> plugin_lib(
+      PluginLib::CreatePluginLib(filename));
   if (plugin_lib.get() == NULL)
     return NULL;
 
   NPError err = plugin_lib->NP_Initialize();
   if (err != NPERR_NO_ERROR)
     return NULL;
 
-  scoped_refptr<NPAPI::PluginInstance> instance(
+  scoped_refptr<PluginInstance> instance(
       plugin_lib->CreateInstance(mime_type));
   return new WebPluginDelegateImpl(containing_view, instance.get());
 }
 
 void WebPluginDelegateImpl::PluginDestroyed() {
   if (handle_event_depth_) {
     MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   } else {
     delete this;
   }
 }
 
 bool WebPluginDelegateImpl::Initialize(
     const GURL& url,
     const std::vector<std::string>& arg_names,
     const std::vector<std::string>& arg_values,
     WebPlugin* plugin,
     bool load_manually) {
   plugin_ = plugin;
 
   instance_->set_web_plugin(plugin_);
   if (quirks_ & PLUGIN_QUIRK_DONT_ALLOW_MULTIPLE_INSTANCES) {
-    NPAPI::PluginLib* plugin_lib = instance()->plugin_lib();
+    PluginLib* plugin_lib = instance()->plugin_lib();
     if (plugin_lib->instance_count() > 1) {
       return false;
     }
   }
 
   if (quirks_ & PLUGIN_QUIRK_DIE_AFTER_UNLOAD)
     webkit_glue::SetForcefullyTerminatePluginProcess(true);
 
   int argc = 0;
   scoped_array<char*> argn(new char*[arg_names.size()]);
@@ skipping 217 matching lines @@
 WebPluginResourceClient* WebPluginDelegateImpl::CreateResourceClient(
     unsigned long resource_id, const GURL& url, int notify_id) {
   return instance()->CreateStream(
       resource_id, url, std::string(), notify_id);
 }
 
 WebPluginResourceClient* WebPluginDelegateImpl::CreateSeekableResourceClient(
     unsigned long resource_id, int range_request_id) {
   return instance()->GetRangeRequest(range_request_id);
 }
+
+}  // namespace npapi
+}  // namespace webkit