cc: Add DISALLOW_COPY_AND_ASSIGN where appropriate.

Also DISALLOW_IMPLICIT_CONSTRUCTORS in a few places instead.

NOTRY=true
R=jamesr

Review URL: https://chromiumcodereview.appspot.com/13065006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190989 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 10 insertions, 1 deletions

diff --git a/cc/input/pinch_zoom_scrollbar.h b/cc/input/pinch_zoom_scrollbar.h
index 2aa6005..c21a5e5 100644
--- a/cc/input/pinch_zoom_scrollbar.h
+++ b/cc/input/pinch_zoom_scrollbar.h
@@ -46,7 +46,7 @@ class PinchZoomScrollbar : public WebKit::WebScrollbar {
   LayerTreeHost* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbar);
-};  // class PinchZoomScrollbar
+};
 
 }  // namespace cc
 #endif  // CC_INPUT_PINCH_ZOOM_SCROLLBAR_H_
diff --git a/cc/input/pinch_zoom_scrollbar_geometry.h b/cc/input/pinch_zoom_scrollbar_geometry.h
index b2795b1..d3c0aca 100644
--- a/cc/input/pinch_zoom_scrollbar_geometry.h
+++ b/cc/input/pinch_zoom_scrollbar_geometry.h
@@ -5,6 +5,7 @@
 #ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
 #define CC_INPUT_PINCH_ZOOM_SCROLLBAR_GEOMETRY_H_
 
+#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebScrollbarThemeGeometry.h"
 
@@ -16,6 +17,7 @@ namespace cc {
 
 class PinchZoomScrollbarGeometry : public WebScrollbarThemeGeometry {
  public:
+  PinchZoomScrollbarGeometry() {}
   virtual ~PinchZoomScrollbarGeometry() {}
 
   static const int kTrackWidth;
@@ -43,6 +45,9 @@ class PinchZoomScrollbarGeometry : public WebScrollbarThemeGeometry {
   virtual void splitTrack(
     WebScrollbar* scrollbar, const WebRect& track, WebRect& start_track,
     WebRect& thumb, WebRect& end_track);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbarGeometry);
 };
 
 }  // namespace WebKit
diff --git a/cc/input/pinch_zoom_scrollbar_painter.h b/cc/input/pinch_zoom_scrollbar_painter.h
index 1a70a748..77bd87b 100644
--- a/cc/input/pinch_zoom_scrollbar_painter.h
+++ b/cc/input/pinch_zoom_scrollbar_painter.h
@@ -5,6 +5,7 @@
 #ifndef CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
 #define CC_INPUT_PINCH_ZOOM_SCROLLBAR_PAINTER_H_
 
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "cc/layers/scrollbar_theme_painter.h"
 
@@ -27,6 +28,9 @@ class PinchZoomScrollbarPainter : public ScrollbarThemePainter {
   virtual void PaintForwardButtonEnd(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
   virtual void PaintTickmarks(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
   virtual void PaintThumb(SkCanvas* canvas, gfx::Rect rect) OVERRIDE;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PinchZoomScrollbarPainter);
 };
 
 }  // namespace cc