Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 15 matching lines @@
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "content/child/appcache_dispatcher.h"
 #include "content/child/child_thread.h"
 #include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilesystem_callback_adapters.h"
+#include "content/child/npapi/webplugin_delegate_impl.h"
 #include "content/child/quota_dispatcher.h"
 #include "content/child/request_extra_data.h"
 #include "content/child/webmessageportchannel_impl.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/database_messages.h"
 #include "content/common/drag_messages.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/input_messages.h"
 #include "content/common/java_bridge_messages.h"
 #include "content/common/pepper_messages.h"
@@ skipping 73 matching lines @@
 #include "content/renderer/renderer_webcolorchooser_impl.h"
 #include "content/renderer/savable_resources.h"
 #include "content/renderer/speech_recognition_dispatcher.h"
 #include "content/renderer/stats_collection_controller.h"
 #include "content/renderer/stats_collection_observer.h"
 #include "content/renderer/text_input_client_observer.h"
 #include "content/renderer/v8_value_converter_impl.h"
 #include "content/renderer/web_ui_extension.h"
 #include "content/renderer/web_ui_extension_data.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
+#include "content/renderer/webplugin_impl.h"
 #include "content/renderer/websharedworker_proxy.h"
 #include "media/audio/audio_output_device.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_switches.h"
 #include "media/filters/audio_renderer_impl.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "net/base/data_url.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
@@ skipping 61 matching lines @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "v8/include/v8.h"
 #include "webkit/common/dom_storage/dom_storage_types.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/weburlresponse_extradata_impl.h"
-#include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_utils.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
-#include "webkit/plugins/npapi/webplugin_impl.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/webpreferences_renderer.h"
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/common/android/device_telephony_info.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/android/address_detector.h"
 #include "content/renderer/android/content_detector.h"
@@ skipping 66 matching lines @@
 using WebKit::WebMouseEvent;
 using WebKit::WebNavigationPolicy;
 using WebKit::WebNavigationType;
 using WebKit::WebNode;
 using WebKit::WebPageSerializer;
 using WebKit::WebPageSerializerClient;
 using WebKit::WebPeerConnection00Handler;
 using WebKit::WebPeerConnection00HandlerClient;
 using WebKit::WebPeerConnectionHandler;
 using WebKit::WebPeerConnectionHandlerClient;
-using WebKit::WebPlugin;
 using WebKit::WebPluginAction;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginDocument;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
 using WebKit::WebPopupMenuInfo;
 using WebKit::WebRange;
 using WebKit::WebRect;
 using WebKit::WebReferrerPolicy;
 using WebKit::WebScriptSource;
@@ skipping 2503 matching lines @@
 void RenderViewImpl::didHandleGestureEvent(
     const WebGestureEvent& event,
     bool event_cancelled) {
   RenderWidget::didHandleGestureEvent(event, event_cancelled);
   FOR_EACH_OBSERVER(RenderViewObserver, observers_,
                     DidHandleGestureEvent(event));
 }
 
 // WebKit::WebFrameClient -----------------------------------------------------
 
-WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
-                                        const WebPluginParams& params) {
-  WebPlugin* plugin = NULL;
+WebKit::WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
+                                                const WebPluginParams& params) {
+  WebKit::WebPlugin* plugin = NULL;
   if (GetContentClient()->renderer()->OverrideCreatePlugin(
           this, frame, params, &plugin)) {
     return plugin;
   }
 
 #if defined(ENABLE_PLUGINS)
   if (UTF16ToASCII(params.mimeType) == kBrowserPluginMimeType) {
     return GetBrowserPluginManager()->CreateBrowserPlugin(this, frame, params);
   }
 
@@ skipping 1859 matching lines @@
     const WebKit::WebPluginParams& params) {
   WebKit::WebPlugin* pepper_webplugin =
       pepper_helper_->CreatePepperWebPlugin(info, params);
 
   if (pepper_webplugin)
     return pepper_webplugin;
 
   if (!webkit::npapi::NPAPIPluginsSupported())
     return NULL;
 
-  return new webkit::npapi::WebPluginImpl(
-      frame, params, info.path, AsWeakPtr());
+  return new WebPluginImpl(frame, params, info.path, AsWeakPtr());
 }
 
 void RenderViewImpl::EvaluateScript(const string16& frame_xpath,
                                     const string16& jscript,
                                     int id,
                                     bool notify_result) {
   v8::HandleScope handle_scope;
   v8::Handle<v8::Value> result;
   WebFrame* web_frame = GetChildFrame(frame_xpath);
   if (web_frame)
@@ skipping 58 matching lines @@
 
 void RenderViewImpl::LoadURLExternally(
     WebKit::WebFrame* frame,
     const WebKit::WebURLRequest& request,
     WebKit::WebNavigationPolicy policy) {
   loadURLExternally(frame, request, policy);
 }
 
 // webkit_glue::WebPluginPageDelegate ------------------------------------------
 
-webkit::npapi::WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
+WebPluginDelegate* RenderViewImpl::CreatePluginDelegate(
     const base::FilePath& file_path,
     const std::string& mime_type) {
   if (!PluginChannelHost::IsListening()) {
     LOG(ERROR) << "PluginChannelHost isn't listening";
     return NULL;
   }
 
   bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();
   if (in_process_plugin) {
 #if defined(OS_WIN) && !defined(USE_AURA)
-    return webkit::npapi::WebPluginDelegateImpl::Create(file_path, mime_type);
+    return WebPluginDelegateImpl::Create(file_path, mime_type);
 #else
     // In-proc plugins aren't supported on non-Windows.
     NOTIMPLEMENTED();
     return NULL;
 #endif
   }
 
   return new WebPluginDelegateProxy(mime_type, AsWeakPtr());
 }
 
 WebKit::WebPlugin* RenderViewImpl::CreatePluginReplacement(
     const base::FilePath& file_path) {
   return GetContentClient()->renderer()->CreatePluginReplacement(
       this, file_path);
 }
 
 void RenderViewImpl::CreatedPluginWindow(gfx::PluginWindowHandle window) {
 #if defined(USE_X11)
   Send(new ViewHostMsg_CreatePluginContainer(routing_id(), window));
 #endif
 }
 
 void RenderViewImpl::WillDestroyPluginWindow(gfx::PluginWindowHandle window) {
 #if defined(USE_X11)
   Send(new ViewHostMsg_DestroyPluginContainer(routing_id(), window));
 #endif
   CleanupWindowInPluginMoves(window);
 }
 
-void RenderViewImpl::DidMovePlugin(
-    const webkit::npapi::WebPluginGeometry& move) {
+void RenderViewImpl::DidMovePlugin(const WebPluginGeometry& move) {
   SchedulePluginMove(move);
 }
 
 void RenderViewImpl::DidStartLoadingForPlugin() {
   // TODO(darin): Make is_loading_ be a counter!
   didStartLoading();
 }
 
 void RenderViewImpl::DidStopLoadingForPlugin() {
   // TODO(darin): Make is_loading_ be a counter!
@@ skipping 1977 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content