| Index: ui/gfx/animation/multi_animation.h
|
| diff --git a/ui/gfx/animation/multi_animation.h b/ui/gfx/animation/multi_animation.h
|
| index f0480980576b10fccdaf609f9c53cc38723f8875..bbcbae41afeb6b8511a895f6a294cb05fddc8414 100644
|
| --- a/ui/gfx/animation/multi_animation.h
|
| +++ b/ui/gfx/animation/multi_animation.h
|
| @@ -57,15 +57,15 @@ class GFX_EXPORT MultiAnimation : public Animation {
|
|
|
| // Returns the current value. The current value for a MultiAnimation is
|
| // determined from the tween type of the current part.
|
| - virtual double GetCurrentValue() const OVERRIDE;
|
| + virtual double GetCurrentValue() const override;
|
|
|
| // Returns the index of the current part.
|
| size_t current_part_index() const { return current_part_index_; }
|
|
|
| protected:
|
| // Animation overrides.
|
| - virtual void Step(base::TimeTicks time_now) OVERRIDE;
|
| - virtual void SetStartTime(base::TimeTicks start_time) OVERRIDE;
|
| + virtual void Step(base::TimeTicks time_now) override;
|
| + virtual void SetStartTime(base::TimeTicks start_time) override;
|
|
|
| private:
|
| // Returns the part containing the specified time. |time_ms| is reset to be
|
|
|