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

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/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/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::npapi::WebPluginResourceClient {
+class ResourceClientProxy : public webkit_glue::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::npapi::WebPlugin* plugin,
+    webkit_glue::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::npapi::WebPluginResourceClient*
+webkit_glue::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::npapi::WebPluginResourceClient*
+webkit_glue::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 22 matching lines @@
     return false;
   OnSetWindow(fake_window);
   if (!Send(new PluginMsg_SetFakeAcceleratedSurfaceWindowHandle(instance_id_,
                                                                 fake_window))) {
     return false;
   }
 
   // Since this isn't a real window, it doesn't get initial size and location
   // information the way a real windowed plugin would, so we need to feed it its
   // starting geometry.
-  webkit::npapi::WebPluginGeometry geom;
+  webkit_glue::WebPluginGeometry geom;
   geom.window = fake_window;
   geom.window_rect = plugin_rect_;
   geom.clip_rect = clip_rect_;
   geom.rects_valid = true;
   geom.visible = true;
   render_view_->DidMovePlugin(geom);
   // Invalidate the plugin region to ensure that the move event actually gets
   // dispatched (for a plugin on an otherwise static page).
   render_view_->didInvalidateRect(WebKit::WebRect(plugin_rect_.x(),
                                                   plugin_rect_.y(),
@@ skipping 118 matching lines @@
 #if defined(OS_WIN)
 bool WebPluginDelegateProxy::UseSynchronousGeometryUpdates() {
   // Need to update geometry synchronously with WMP, otherwise if a site
   // scripts the plugin to start playing while it's in the middle of handling
   // an update geometry message, videos don't play.  See urls in bug 20260.
   if (info_.name.find(ASCIIToUTF16("Windows Media Player")) != string16::npos)
     return true;
 
   // The move networks plugin needs to be informed of geometry updates
   // synchronously.
-  std::vector<webkit::npapi::WebPluginMimeType>::iterator index;
+  std::vector<WebPluginMimeType>::iterator index;
   for (index = info_.mime_types.begin(); index != info_.mime_types.end();
        index++) {
     if (index->mime_type == "application/x-vnd.moveplayer.qm" ||
         index->mime_type == "application/x-vnd.moveplay2.qm" ||
         index->mime_type == "application/x-vnd.movenetworks.qm" ||
         index->mime_type == "application/x-vnd.mnplayer.qm") {
       return true;
     }
   }
   return false;
 }
 #endif
 
 void WebPluginDelegateProxy::OnURLRedirectResponse(bool allow,
                                                    int resource_id) {
   if (!plugin_)
     return;
 
   plugin_->URLRedirectResponse(allow, resource_id);
 }