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

chrome/renderer/render_widget_fullscreen_pepper.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_widget_fullscreen_pepper.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebWidget.h"
-#include "webkit/glue/plugins/pepper_fullscreen_container.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
+#include "webkit/plugins/ppapi/fullscreen_container.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
 
 using WebKit::WebCanvas;
 using WebKit::WebCompositionUnderline;
 using WebKit::WebCursorInfo;
 using WebKit::WebInputEvent;
 using WebKit::WebRect;
 using WebKit::WebSize;
 using WebKit::WebString;
 using WebKit::WebTextDirection;
 using WebKit::WebTextInputType;
 using WebKit::WebVector;
 using WebKit::WebWidget;
 
 namespace {
 
 // WebWidget that simply wraps the pepper plugin.
 class PepperWidget : public WebWidget {
  public:
-  PepperWidget(pepper::PluginInstance* plugin,
+  PepperWidget(webkit::ppapi::PluginInstance* plugin,
                RenderWidgetFullscreenPepper* widget)
       : plugin_(plugin),
         widget_(widget),
         cursor_(WebCursorInfo::TypePointer) {
   }
 
   // WebWidget API
   virtual void close() {
     delete this;
   }
@@ skipping 69 matching lines @@
   virtual void setTextDirection(WebTextDirection) {
     NOTIMPLEMENTED();
   }
 
   virtual bool isAcceleratedCompositingActive() const {
     // TODO(piman): see if supporting accelerated compositing makes sense.
     return false;
   }
 
  private:
-  pepper::PluginInstance* plugin_;
+  webkit::ppapi::PluginInstance* plugin_;
   RenderWidgetFullscreenPepper* widget_;
   WebSize size_;
   WebCursorInfo cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperWidget);
 };
 
 
 // A FullscreenContainer that forwards the API calls to the
 // RenderWidgetFullscreenPepper.
-class WidgetFullscreenContainer : public pepper::FullscreenContainer {
+class WidgetFullscreenContainer
+    : public webkit::ppapi::FullscreenContainer {
  public:
   explicit WidgetFullscreenContainer(RenderWidgetFullscreenPepper* widget)
       : widget_(widget) {
   }
   virtual ~WidgetFullscreenContainer() { }
 
   virtual void Invalidate() {
     widget_->GenerateFullRepaint();
   }
 
@@ skipping 13 matching lines @@
   RenderWidgetFullscreenPepper* widget_;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetFullscreenContainer);
 };
 
 }  // anonymous namespace
 
 // static
 RenderWidgetFullscreenPepper* RenderWidgetFullscreenPepper::Create(
     int32 opener_id, RenderThreadBase* render_thread,
-    pepper::PluginInstance* plugin) {
+    webkit::ppapi::PluginInstance* plugin) {
   DCHECK_NE(MSG_ROUTING_NONE, opener_id);
   scoped_refptr<RenderWidgetFullscreenPepper> widget(
       new RenderWidgetFullscreenPepper(render_thread, plugin));
   widget->Init(opener_id);
   return widget.release();
 }
 
 RenderWidgetFullscreenPepper::RenderWidgetFullscreenPepper(
-    RenderThreadBase* render_thread, pepper::PluginInstance* plugin)
+    RenderThreadBase* render_thread,
+    webkit::ppapi::PluginInstance* plugin)
     : RenderWidgetFullscreen(render_thread, WebKit::WebPopupTypeSelect),
       plugin_(plugin),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           container_(new WidgetFullscreenContainer(this))) {
 }
 
 RenderWidgetFullscreenPepper::~RenderWidgetFullscreenPepper() {
 }
 
 WebWidget* RenderWidgetFullscreenPepper::CreateWebWidget() {
@@ skipping 32 matching lines @@
     const gfx::Rect& paint_bounds,
     TransportDIB** dib,
     gfx::Rect* location,
     gfx::Rect* clip) {
   if (plugin_) {
     return plugin_->GetBitmapForOptimizedPluginPaint(
         paint_bounds, dib, location, clip);
   }
   return false;
 }