Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Side by Side Diff: cc/layers/solid_color_scrollbar_layer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/layers/solid_color_layer_impl.h ('k') | cc/layers/solid_color_scrollbar_layer_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_ 5 #ifndef CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
6 #define CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_ 6 #define CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
7 7
8 #include "cc/base/cc_export.h" 8 #include "cc/base/cc_export.h"
9 #include "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/layers/scrollbar_layer_interface.h" 10 #include "cc/layers/scrollbar_layer_interface.h"
11 11
12 namespace cc { 12 namespace cc {
13 13
14 class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface, 14 class CC_EXPORT SolidColorScrollbarLayer : public ScrollbarLayerInterface,
15 public Layer { 15 public Layer {
16 public: 16 public:
17 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) 17 virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
18 OVERRIDE; 18 override;
19 19
20 static scoped_refptr<SolidColorScrollbarLayer> Create( 20 static scoped_refptr<SolidColorScrollbarLayer> Create(
21 ScrollbarOrientation orientation, 21 ScrollbarOrientation orientation,
22 int thumb_thickness, 22 int thumb_thickness,
23 int track_start, 23 int track_start,
24 bool is_left_side_vertical_scrollbar, 24 bool is_left_side_vertical_scrollbar,
25 int scroll_layer_id); 25 int scroll_layer_id);
26 26
27 // Layer overrides. 27 // Layer overrides.
28 virtual bool OpacityCanAnimateOnImplThread() const OVERRIDE; 28 virtual bool OpacityCanAnimateOnImplThread() const override;
29 virtual ScrollbarLayerInterface* ToScrollbarLayer() OVERRIDE; 29 virtual ScrollbarLayerInterface* ToScrollbarLayer() override;
30 30
31 virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; 31 virtual void PushPropertiesTo(LayerImpl* layer) override;
32 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) OVERRIDE; 32 virtual void PushScrollClipPropertiesTo(LayerImpl* layer) override;
33 33
34 virtual void SetNeedsDisplayRect(const gfx::RectF&) OVERRIDE; 34 virtual void SetNeedsDisplayRect(const gfx::RectF&) override;
35 35
36 // ScrollbarLayerInterface 36 // ScrollbarLayerInterface
37 virtual int ScrollLayerId() const OVERRIDE; 37 virtual int ScrollLayerId() const override;
38 virtual void SetScrollLayer(int layer_id) OVERRIDE; 38 virtual void SetScrollLayer(int layer_id) override;
39 virtual void SetClipLayer(int layer_id) OVERRIDE; 39 virtual void SetClipLayer(int layer_id) override;
40 40
41 virtual ScrollbarOrientation orientation() const OVERRIDE; 41 virtual ScrollbarOrientation orientation() const override;
42 42
43 protected: 43 protected:
44 SolidColorScrollbarLayer(ScrollbarOrientation orientation, 44 SolidColorScrollbarLayer(ScrollbarOrientation orientation,
45 int thumb_thickness, 45 int thumb_thickness,
46 int track_start, 46 int track_start,
47 bool is_left_side_vertical_scrollbar, 47 bool is_left_side_vertical_scrollbar,
48 int scroll_layer_id); 48 int scroll_layer_id);
49 virtual ~SolidColorScrollbarLayer(); 49 virtual ~SolidColorScrollbarLayer();
50 50
51 private: 51 private:
52 int scroll_layer_id_; 52 int scroll_layer_id_;
53 int clip_layer_id_; 53 int clip_layer_id_;
54 ScrollbarOrientation orientation_; 54 ScrollbarOrientation orientation_;
55 int thumb_thickness_; 55 int thumb_thickness_;
56 int track_start_; 56 int track_start_;
57 bool is_left_side_vertical_scrollbar_; 57 bool is_left_side_vertical_scrollbar_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(SolidColorScrollbarLayer); 59 DISALLOW_COPY_AND_ASSIGN(SolidColorScrollbarLayer);
60 }; 60 };
61 61
62 } // namespace cc 62 } // namespace cc
63 63
64 #endif // CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_ 64 #endif // CC_LAYERS_SOLID_COLOR_SCROLLBAR_LAYER_H_
OLDNEW
« no previous file with comments | « cc/layers/solid_color_layer_impl.h ('k') | cc/layers/solid_color_scrollbar_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698