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

chrome/renderer/webplugin_delegate_proxy.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 "chrome/renderer/webplugin_delegate_proxy.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 30 matching lines @@
 #include "net/base/mime_util.h"
 #include "printing/native_metafile.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/plugins/npapi/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #endif
 
 using WebKit::WebBindings;
 using WebKit::WebCursorInfo;
 using WebKit::WebDragData;
 using WebKit::WebInputEvent;
 using WebKit::WebString;
 using WebKit::WebVector;
 using WebKit::WebView;
 
 // Proxy for WebPluginResourceClient.  The object owns itself after creation,
 // deleting itself after its callback has been called.
-class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
+class ResourceClientProxy : public webkit::npapi::WebPluginResourceClient {
  public:
   ResourceClientProxy(PluginChannelHost* channel, int instance_id)
     : channel_(channel), instance_id_(instance_id), resource_id_(0),
       multibyte_response_expected_(false) {
   }
 
   ~ResourceClientProxy() {
   }
 
   void Initialize(unsigned long resource_id, const GURL& url, int notify_id) {
@@ skipping 181 matching lines @@
     base::SplitString(value_string, ',', &components);
     if (components.size() == 4 && !StartsWithASCII(components[0], "1", false))
       return true;
   } else if (LowerCaseEqualsASCII(color, "transparent")) {
     return true;
   }
   // Anything else is a named, opaque color or an RGB form with no alpha.
   return false;
 }
 
-bool WebPluginDelegateProxy::Initialize(const GURL& url,
+bool WebPluginDelegateProxy::Initialize(
+    const GURL& url,
     const std::vector<std::string>& arg_names,
     const std::vector<std::string>& arg_values,
-    webkit_glue::WebPlugin* plugin,
+    webkit::npapi::WebPlugin* plugin,
     bool load_manually) {
   IPC::ChannelHandle channel_handle;
   if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
           url, mime_type_, &channel_handle, &info_))) {
     return false;
   }
 
   if (channel_handle.name.empty()) {
     // We got an invalid handle.  Either the plugin couldn't be found (which
     // shouldn't happen, since if we got here the plugin should exist) or the
@@ skipping 1058 matching lines @@
   const char* target = NULL;
   if (params.target.length())
     target = params.target.c_str();
 
   plugin_->HandleURLRequest(
       params.url.c_str(), params.method.c_str(), target, data,
       static_cast<unsigned int>(params.buffer.size()), params.notify_id,
       params.popups_allowed, params.notify_redirects);
 }
 
-webkit_glue::WebPluginResourceClient*
+webkit::npapi::WebPluginResourceClient*
 WebPluginDelegateProxy::CreateResourceClient(
     unsigned long resource_id, const GURL& url, int notify_id) {
   if (!channel_host_)
     return NULL;
 
   ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
                                                        instance_id_);
   proxy->Initialize(resource_id, url, notify_id);
   return proxy;
 }
 
-webkit_glue::WebPluginResourceClient*
+webkit::npapi::WebPluginResourceClient*
 WebPluginDelegateProxy::CreateSeekableResourceClient(
     unsigned long resource_id, int range_request_id) {
   if (!channel_host_)
     return NULL;
 
   ResourceClientProxy* proxy = new ResourceClientProxy(channel_host_,
                                                        instance_id_);
   proxy->InitializeForSeekableStream(resource_id, range_request_id);
   return proxy;
 }
@@ skipping 183 matching lines @@
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }