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

Side by Side Diff: cc/animation/scrollbar_animation_controller_linear_fade.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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ 5 #ifndef CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ 6 #define CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "cc/animation/scrollbar_animation_controller.h" 9 #include "cc/animation/scrollbar_animation_controller.h"
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
11 11
12 namespace cc { 12 namespace cc {
13 class LayerImpl; 13 class LayerImpl;
14 14
15 class CC_EXPORT ScrollbarAnimationControllerLinearFade 15 class CC_EXPORT ScrollbarAnimationControllerLinearFade
16 : public ScrollbarAnimationController { 16 : public ScrollbarAnimationController {
17 public: 17 public:
18 static scoped_ptr<ScrollbarAnimationControllerLinearFade> Create( 18 static scoped_ptr<ScrollbarAnimationControllerLinearFade> Create(
19 LayerImpl* scroll_layer, 19 LayerImpl* scroll_layer,
20 ScrollbarAnimationControllerClient* client, 20 ScrollbarAnimationControllerClient* client,
21 base::TimeDelta delay_before_starting, 21 base::TimeDelta delay_before_starting,
22 base::TimeDelta duration); 22 base::TimeDelta duration);
23 23
24 virtual ~ScrollbarAnimationControllerLinearFade(); 24 virtual ~ScrollbarAnimationControllerLinearFade();
25 25
26 virtual void DidScrollUpdate() OVERRIDE; 26 virtual void DidScrollUpdate() override;
27 27
28 protected: 28 protected:
29 ScrollbarAnimationControllerLinearFade( 29 ScrollbarAnimationControllerLinearFade(
30 LayerImpl* scroll_layer, 30 LayerImpl* scroll_layer,
31 ScrollbarAnimationControllerClient* client, 31 ScrollbarAnimationControllerClient* client,
32 base::TimeDelta delay_before_starting, 32 base::TimeDelta delay_before_starting,
33 base::TimeDelta duration); 33 base::TimeDelta duration);
34 34
35 virtual void RunAnimationFrame(float progress) OVERRIDE; 35 virtual void RunAnimationFrame(float progress) override;
36 36
37 private: 37 private:
38 float OpacityAtTime(base::TimeTicks now) const; 38 float OpacityAtTime(base::TimeTicks now) const;
39 void ApplyOpacityToScrollbars(float opacity); 39 void ApplyOpacityToScrollbars(float opacity);
40 40
41 LayerImpl* scroll_layer_; 41 LayerImpl* scroll_layer_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade); 43 DISALLOW_COPY_AND_ASSIGN(ScrollbarAnimationControllerLinearFade);
44 }; 44 };
45 45
46 } // namespace cc 46 } // namespace cc
47 47
48 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_ 48 #endif // CC_ANIMATION_SCROLLBAR_ANIMATION_CONTROLLER_LINEAR_FADE_H_
OLDNEW
« no previous file with comments | « cc/animation/scroll_offset_animation_curve.h ('k') | cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698