| Index: cc/layers/solid_color_scrollbar_layer_impl.h
|
| diff --git a/cc/layers/solid_color_scrollbar_layer_impl.h b/cc/layers/solid_color_scrollbar_layer_impl.h
|
| index 91f1ac3ac2003565588cdad8cd1d68d993254d89..93f1561fbf6876cc77bf18e6745387533415dc60 100644
|
| --- a/cc/layers/solid_color_scrollbar_layer_impl.h
|
| +++ b/cc/layers/solid_color_scrollbar_layer_impl.h
|
| @@ -24,12 +24,12 @@ class CC_EXPORT SolidColorScrollbarLayerImpl : public ScrollbarLayerImplBase {
|
|
|
| // LayerImpl overrides.
|
| virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
|
| - OVERRIDE;
|
| - virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
|
| + override;
|
| + virtual void PushPropertiesTo(LayerImpl* layer) override;
|
|
|
| virtual void AppendQuads(RenderPass* render_pass,
|
| const OcclusionTracker<LayerImpl>& occlusion_tracker,
|
| - AppendQuadsData* append_quads_data) OVERRIDE;
|
| + AppendQuadsData* append_quads_data) override;
|
|
|
| protected:
|
| SolidColorScrollbarLayerImpl(LayerTreeImpl* tree_impl,
|
| @@ -41,11 +41,11 @@ class CC_EXPORT SolidColorScrollbarLayerImpl : public ScrollbarLayerImplBase {
|
| bool is_overlay);
|
|
|
| // ScrollbarLayerImplBase implementation.
|
| - virtual int ThumbThickness() const OVERRIDE;
|
| - virtual int ThumbLength() const OVERRIDE;
|
| - virtual float TrackLength() const OVERRIDE;
|
| - virtual int TrackStart() const OVERRIDE;
|
| - virtual bool IsThumbResizable() const OVERRIDE;
|
| + virtual int ThumbThickness() const override;
|
| + virtual int ThumbLength() const override;
|
| + virtual float TrackLength() const override;
|
| + virtual int TrackStart() const override;
|
| + virtual bool IsThumbResizable() const override;
|
|
|
| private:
|
| int thumb_thickness_;
|
|
|