summaryrefslogtreecommitdiffstats
path: root/cc/layers/painted_scrollbar_layer_impl.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 11:07:37 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 18:07:51 +0000
commitf68776d8c52601899d957c7ac222693fd51405d2 (patch)
treee769b135b24375bf55447c1c4638a99927e4d98c /cc/layers/painted_scrollbar_layer_impl.h
parentee4b857ca20186868aad7a5b22fc454a11b6fe86 (diff)
downloadchromium_src-f68776d8c52601899d957c7ac222693fd51405d2.zip
chromium_src-f68776d8c52601899d957c7ac222693fd51405d2.tar.gz
chromium_src-f68776d8c52601899d957c7ac222693fd51405d2.tar.bz2
replace OVERRIDE and FINAL with override and final in cc/
BUG=417463 Review URL: https://codereview.chromium.org/628443002 Cr-Commit-Position: refs/heads/master@{#298271}
Diffstat (limited to 'cc/layers/painted_scrollbar_layer_impl.h')
-rw-r--r--cc/layers/painted_scrollbar_layer_impl.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/cc/layers/painted_scrollbar_layer_impl.h b/cc/layers/painted_scrollbar_layer_impl.h
index 4ebefb6..d835223 100644
--- a/cc/layers/painted_scrollbar_layer_impl.h
+++ b/cc/layers/painted_scrollbar_layer_impl.h
@@ -25,14 +25,14 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase {
// LayerImpl implementation.
virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
- OVERRIDE;
- virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
+ override;
+ virtual void PushPropertiesTo(LayerImpl* layer) override;
virtual bool WillDraw(DrawMode draw_mode,
- ResourceProvider* resource_provider) OVERRIDE;
+ ResourceProvider* resource_provider) override;
virtual void AppendQuads(RenderPass* render_pass,
const OcclusionTracker<LayerImpl>& occlusion_tracker,
- AppendQuadsData* append_quads_data) OVERRIDE;
+ AppendQuadsData* append_quads_data) override;
void SetThumbThickness(int thumb_thickness);
void SetThumbLength(int thumb_length);
@@ -52,14 +52,14 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase {
ScrollbarOrientation orientation);
// 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:
- virtual const char* LayerTypeAsString() const OVERRIDE;
+ virtual const char* LayerTypeAsString() const override;
UIResourceId track_ui_resource_id_;
UIResourceId thumb_ui_resource_id_;