| Index: ui/base/animation/multi_animation.h
|
| diff --git a/ui/base/animation/multi_animation.h b/ui/base/animation/multi_animation.h
|
| index ff4cd5dbee17492b598b8702bd769b80afae41b7..240c6da691f819fe4477f51d9b3fbc815cd0f293 100644
|
| --- a/ui/base/animation/multi_animation.h
|
| +++ b/ui/base/animation/multi_animation.h
|
| @@ -55,15 +55,15 @@ class UI_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;
|
| + 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);
|
| - virtual void SetStartTime(base::TimeTicks start_time);
|
| + 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
|
|
|