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

Side by Side Diff: ui/gfx/animation/linear_animation.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (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 | « ui/gfx/animation/animation_unittest.cc ('k') | ui/gfx/animation/multi_animation.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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 UI_GFX_ANIMATION_LINEAR_ANIMATION_H_ 5 #ifndef UI_GFX_ANIMATION_LINEAR_ANIMATION_H_
6 #define UI_GFX_ANIMATION_LINEAR_ANIMATION_H_ 6 #define UI_GFX_ANIMATION_LINEAR_ANIMATION_H_
7 7
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "ui/gfx/animation/animation.h" 9 #include "ui/gfx/animation/animation.h"
10 10
(...skipping 12 matching lines...) Expand all
23 // duration can change between calls to Start() and we need to 23 // duration can change between calls to Start() and we need to
24 // expose this interface. 24 // expose this interface.
25 LinearAnimation(int frame_rate, AnimationDelegate* delegate); 25 LinearAnimation(int frame_rate, AnimationDelegate* delegate);
26 26
27 // Initializes all fields. 27 // Initializes all fields.
28 LinearAnimation(int duration, int frame_rate, AnimationDelegate* delegate); 28 LinearAnimation(int duration, int frame_rate, AnimationDelegate* delegate);
29 29
30 // Gets the value for the current state, according to the animation curve in 30 // Gets the value for the current state, according to the animation curve in
31 // use. This class provides only for a linear relationship, however subclasses 31 // use. This class provides only for a linear relationship, however subclasses
32 // can override this to provide others. 32 // can override this to provide others.
33 virtual double GetCurrentValue() const OVERRIDE; 33 virtual double GetCurrentValue() const override;
34 34
35 // Change the current state of the animation to |new_value|. 35 // Change the current state of the animation to |new_value|.
36 void SetCurrentValue(double new_value); 36 void SetCurrentValue(double new_value);
37 37
38 // Skip to the end of the current animation. 38 // Skip to the end of the current animation.
39 void End(); 39 void End();
40 40
41 // Changes the length of the animation. This resets the current 41 // Changes the length of the animation. This resets the current
42 // state of the animation to the beginning. 42 // state of the animation to the beginning.
43 void SetDuration(int duration); 43 void SetDuration(int duration);
44 44
45 protected: 45 protected:
46 // Called when the animation progresses. Subclasses override this to 46 // Called when the animation progresses. Subclasses override this to
47 // efficiently update their state. 47 // efficiently update their state.
48 virtual void AnimateToState(double state) {} 48 virtual void AnimateToState(double state) {}
49 49
50 // Invoked by the AnimationContainer when the animation is running to advance 50 // Invoked by the AnimationContainer when the animation is running to advance
51 // the animation. Use |time_now| rather than Time::Now to avoid multiple 51 // the animation. Use |time_now| rather than Time::Now to avoid multiple
52 // animations running at the same time diverging. 52 // animations running at the same time diverging.
53 virtual void Step(base::TimeTicks time_now) OVERRIDE; 53 virtual void Step(base::TimeTicks time_now) override;
54 54
55 // Overriden to initialize state. 55 // Overriden to initialize state.
56 virtual void AnimationStarted() OVERRIDE; 56 virtual void AnimationStarted() override;
57 57
58 // Overriden to advance to the end (if End was invoked). 58 // Overriden to advance to the end (if End was invoked).
59 virtual void AnimationStopped() OVERRIDE; 59 virtual void AnimationStopped() override;
60 60
61 // Overriden to return true if state is not 1. 61 // Overriden to return true if state is not 1.
62 virtual bool ShouldSendCanceledFromStop() OVERRIDE; 62 virtual bool ShouldSendCanceledFromStop() override;
63 63
64 private: 64 private:
65 base::TimeDelta duration_; 65 base::TimeDelta duration_;
66 66
67 // Current state, on a scale from 0.0 to 1.0. 67 // Current state, on a scale from 0.0 to 1.0.
68 double state_; 68 double state_;
69 69
70 // If true, we're in end. This is used to determine if the animation should 70 // If true, we're in end. This is used to determine if the animation should
71 // be advanced to the end from AnimationStopped. 71 // be advanced to the end from AnimationStopped.
72 bool in_end_; 72 bool in_end_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(LinearAnimation); 74 DISALLOW_COPY_AND_ASSIGN(LinearAnimation);
75 }; 75 };
76 76
77 } // namespace gfx 77 } // namespace gfx
78 78
79 #endif // APP_LINEAR_ANIMATION_H_ 79 #endif // APP_LINEAR_ANIMATION_H_
OLDNEW
« no previous file with comments | « ui/gfx/animation/animation_unittest.cc ('k') | ui/gfx/animation/multi_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698