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

webkit/plugins/ppapi/ppb_scrollbar_impl.h

Index: webkit/plugins/ppapi/ppb_scrollbar_impl.h
===================================================================
--- webkit/plugins/ppapi/ppb_scrollbar_impl.h	(revision 0)
+++ webkit/plugins/ppapi/ppb_scrollbar_impl.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_SCROLLBAR_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_SCROLLBAR_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
+#define WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_
 
 #include <vector>
 
@@ -11,23 +11,25 @@
 #include "ppapi/c/dev/ppb_scrollbar_dev.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScrollbarClient.h"
-#include "webkit/glue/plugins/pepper_widget.h"
+#include "webkit/plugins/ppapi/ppb_widget_impl.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 class PluginInstance;
 
-class Scrollbar : public Widget, public WebKit::WebScrollbarClient {
+class PPB_Scrollbar_Impl : public PPB_Widget_Impl,
+                           public WebKit::WebScrollbarClient {
  public:
-  Scrollbar(PluginInstance* instance, bool vertical);
-  virtual ~Scrollbar();
+  PPB_Scrollbar_Impl(PluginInstance* instance, bool vertical);
+  virtual ~PPB_Scrollbar_Impl();
 
   // Returns a pointer to the interface implementing PPB_Scrollbar that is
   // exposed to the plugin.
   static const PPB_Scrollbar_Dev* GetInterface();
 
   // Resource overrides.
-  virtual Scrollbar* AsScrollbar();
+  virtual PPB_Scrollbar_Impl* AsPPB_Scrollbar_Impl();
 
   // PPB_Scrollbar implementation.
   uint32_t GetValue();
@@ -37,7 +39,7 @@
   void ScrollBy(PP_ScrollBy_Dev unit, int32_t multiplier);
 
   // PPB_Widget implementation.
-  virtual bool Paint(const PP_Rect* rect, ImageData* image);
+  virtual bool Paint(const PP_Rect* rect, PPB_ImageData_Impl* image);
   virtual bool HandleEvent(const PP_InputEvent* event);
   virtual void SetLocationInternal(const PP_Rect* location);
 
@@ -55,8 +57,11 @@
   gfx::Rect dirty_;
   std::vector<WebKit::WebRect> tickmarks_;
   scoped_ptr<WebKit::WebScrollbar> scrollbar_;
+
+  DISALLOW_COPY_AND_ASSIGN(PPB_Scrollbar_Impl);
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_SCROLLBAR_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_PPB_SCROLLBAR_IMPL_H_