Index: webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h |
diff --git a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h |
index 47e365b9babb3c91b141b3044d476008005cb4fd..c763464782f1d2b33ebed88970463b05fd548d4a 100644 |
--- a/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h |
+++ b/webkit/compositor_bindings/web_to_ccscrollbar_theme_painter_adapter.h |
@@ -8,14 +8,14 @@ |
#include "base/memory/scoped_ptr.h" |
#include "cc/layers/scrollbar_theme_painter.h" |
-namespace WebKit { |
+namespace WebKit { class WebScrollbarThemePainter; } |
-class WebScrollbarThemePainter; |
+namespace webkit { |
class WebToCCScrollbarThemePainterAdapter : public cc::ScrollbarThemePainter { |
public: |
static scoped_ptr<WebToCCScrollbarThemePainterAdapter> Create( |
- scoped_ptr<WebScrollbarThemePainter> web_painter) { |
+ scoped_ptr<WebKit::WebScrollbarThemePainter> web_painter) { |
return make_scoped_ptr( |
new WebToCCScrollbarThemePainterAdapter(web_painter.Pass())); |
} |
@@ -41,13 +41,14 @@ class WebToCCScrollbarThemePainterAdapter : public cc::ScrollbarThemePainter { |
virtual void PaintThumb(SkCanvas* canvas, const gfx::Rect& rect) OVERRIDE; |
private: |
- WebToCCScrollbarThemePainterAdapter( |
- scoped_ptr<WebScrollbarThemePainter> web_painter) |
- : painter_(web_painter.Pass()) {} |
+ explicit WebToCCScrollbarThemePainterAdapter( |
+ scoped_ptr<WebKit::WebScrollbarThemePainter> web_painter); |
- scoped_ptr<WebScrollbarThemePainter> painter_; |
+ scoped_ptr<WebKit::WebScrollbarThemePainter> painter_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(WebToCCScrollbarThemePainterAdapter); |
}; |
-} // namespace WebKit |
+} // namespace webkit |
#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_TO_CCSCROLLBAR_THEME_PAINTER_ADAPTER_H_ |