Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

chrome/renderer/render_view.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/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 157 matching lines @@
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/image_decoder.h"
 #include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/media/buffered_data_source.h"
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/password_form_dom_manager.h"
 #include "webkit/glue/plugins/default_plugin_shared.h"
-#include "webkit/glue/plugins/pepper_webplugin_impl.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugin_delegate.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 #include "webkit/glue/plugins/webplugin_impl.h"
 #include "webkit/glue/plugins/webview_plugin.h"
 #include "webkit/glue/resource_fetcher.h"
 #include "webkit/glue/site_isolation_metrics.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/plugins/ppapi/webplugin_impl.h"
 
 #if defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "gfx/native_theme_win.h"
 #elif defined(USE_X11)
 #include "gfx/native_theme_linux.h"
 #include "third_party/WebKit/WebKit/chromium/public/linux/WebRenderTheme.h"
 #elif defined(OS_MACOSX)
 #include "skia/ext/skia_utils_mac.h"
@@ skipping 638 matching lines @@
   WebPluginInfo info;
   bool found;
   ContentSetting setting;
   std::string mime_type;
   Send(new ViewHostMsg_GetPluginInfo(
       params.url, frame->top()->url(), params.mimeType.utf8(), &found,
       &info, &setting, &mime_type));
   if (!found || !info.enabled)
     return NULL;
 
-  scoped_refptr<pepper::PluginModule> pepper_module(
+  scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
       pepper_delegate_.CreatePepperPlugin(info.path));
   if (pepper_module)
     return CreatePepperPlugin(frame, params, info.path, pepper_module.get());
   return CreateNPAPIPlugin(frame, params, info.path, mime_type);
 }
 
 void RenderView::CustomMenuListenerInstall(CustomMenuListener* listening) {
   custom_menu_listener_ = listening;
 }
 
@@ skipping 1262 matching lines @@
   return external_popup_menu_.get();
 }
 
 WebWidget* RenderView::createFullscreenWindow(WebKit::WebPopupType popup_type) {
   RenderWidget* widget = RenderWidgetFullscreen::Create(routing_id_,
                                                         render_thread_,
                                                         popup_type);
   return widget->webwidget();
 }
 
-pepper::FullscreenContainer* RenderView::CreatePepperFullscreenContainer(
-    pepper::PluginInstance* plugin) {
+webkit::ppapi::FullscreenContainer*
+RenderView::CreatePepperFullscreenContainer(
+    webkit::ppapi::PluginInstance* plugin) {
   RenderWidgetFullscreenPepper* widget =
       RenderWidgetFullscreenPepper::Create(routing_id_, render_thread_, plugin);
   widget->show(WebKit::WebNavigationPolicyIgnore);
   return widget->container();
 }
 
 WebStorageNamespace* RenderView::createSessionStorageNamespace(unsigned quota) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess))
     return WebStorageNamespace::createSessionStorageNamespace(quota);
   CHECK(session_storage_namespace_id_ != kInvalidSessionStorageNamespaceId);
@@ skipping 631 matching lines @@
       return CreateOutdatedPluginPlaceholder(frame, params, *group);
     }
     return NULL;
   }
 
   ContentSetting host_setting =
       current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
   if (info.path.value() == kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
-    scoped_refptr<pepper::PluginModule> pepper_module(
+    scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
         pepper_delegate_.CreatePepperPlugin(info.path));
     if (pepper_module)
       return CreatePepperPlugin(frame, params, info.path, pepper_module.get());
     return CreateNPAPIPlugin(frame, params, info.path, actual_mime_type);
   }
   std::string resource;
   if (cmd->HasSwitch(switches::kEnableResourceContentSettings))
     resource = group->identifier();
   DidBlockContentType(CONTENT_SETTINGS_TYPE_PLUGINS, resource);
   int resource_id;
@@ skipping 1627 matching lines @@
     Send(new ViewHostMsg_ContentBlocked(routing_id_, settings_type,
                                         resource_identifier));
   }
 }
 
 void RenderView::ClearBlockedContentSettings() {
   for (size_t i = 0; i < arraysize(content_blocked_); ++i)
     content_blocked_[i] = false;
 }
 
-WebPlugin* RenderView::CreatePepperPlugin(WebFrame* frame,
-                                          const WebPluginParams& params,
-                                          const FilePath& path,
-                                          pepper::PluginModule* pepper_module) {
-  return new pepper::WebPluginImpl(
+WebPlugin* RenderView::CreatePepperPlugin(
+    WebFrame* frame,
+    const WebPluginParams& params,
+    const FilePath& path,
+    webkit::ppapi::PluginModule* pepper_module) {
+  return new webkit::ppapi::WebPluginImpl(
       pepper_module, params, pepper_delegate_.AsWeakPtr());
 }
 
 WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
                                          const WebPluginParams& params,
                                          const FilePath& path,
                                          const std::string& mime_type) {
   return new webkit_glue::WebPluginImpl(
       frame, params, path, mime_type, AsWeakPtr());
 }
@@ skipping 1313 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }