| Index: ui/gfx/animation/linear_animation.h
|
| diff --git a/ui/gfx/animation/linear_animation.h b/ui/gfx/animation/linear_animation.h
|
| index 401f1be18bbac8c1f1c2c863c43efef282d8e63a..d74b847cec9175c31545ee5c4a980654c235d9ce 100644
|
| --- a/ui/gfx/animation/linear_animation.h
|
| +++ b/ui/gfx/animation/linear_animation.h
|
| @@ -30,7 +30,7 @@ class GFX_EXPORT LinearAnimation : public Animation {
|
| // Gets the value for the current state, according to the animation curve in
|
| // use. This class provides only for a linear relationship, however subclasses
|
| // can override this to provide others.
|
| - virtual double GetCurrentValue() const OVERRIDE;
|
| + virtual double GetCurrentValue() const override;
|
|
|
| // Change the current state of the animation to |new_value|.
|
| void SetCurrentValue(double new_value);
|
| @@ -50,16 +50,16 @@ class GFX_EXPORT LinearAnimation : public Animation {
|
| // Invoked by the AnimationContainer when the animation is running to advance
|
| // the animation. Use |time_now| rather than Time::Now to avoid multiple
|
| // animations running at the same time diverging.
|
| - virtual void Step(base::TimeTicks time_now) OVERRIDE;
|
| + virtual void Step(base::TimeTicks time_now) override;
|
|
|
| // Overriden to initialize state.
|
| - virtual void AnimationStarted() OVERRIDE;
|
| + virtual void AnimationStarted() override;
|
|
|
| // Overriden to advance to the end (if End was invoked).
|
| - virtual void AnimationStopped() OVERRIDE;
|
| + virtual void AnimationStopped() override;
|
|
|
| // Overriden to return true if state is not 1.
|
| - virtual bool ShouldSendCanceledFromStop() OVERRIDE;
|
| + virtual bool ShouldSendCanceledFromStop() override;
|
|
|
| private:
|
| base::TimeDelta duration_;
|
|
|