| Index: ui/gfx/animation/throb_animation.h
|
| diff --git a/ui/gfx/animation/throb_animation.h b/ui/gfx/animation/throb_animation.h
|
| index 8bea7f8799c019842ef019c3874faf25ac97ed3f..27da800887d79e019004ede89c03a9826215fbc5 100644
|
| --- a/ui/gfx/animation/throb_animation.h
|
| +++ b/ui/gfx/animation/throb_animation.h
|
| @@ -29,13 +29,13 @@ class GFX_EXPORT ThrobAnimation : public SlideAnimation {
|
| void SetThrobDuration(int duration) { throb_duration_ = duration; }
|
|
|
| // Overridden to reset to the slide duration.
|
| - virtual void Reset() OVERRIDE;
|
| - virtual void Reset(double value) OVERRIDE;
|
| - virtual void Show() OVERRIDE;
|
| - virtual void Hide() OVERRIDE;
|
| + virtual void Reset() override;
|
| + virtual void Reset(double value) override;
|
| + virtual void Show() override;
|
| + virtual void Hide() override;
|
|
|
| // Overridden to maintain the slide duration.
|
| - virtual void SetSlideDuration(int duration) OVERRIDE;
|
| + virtual void SetSlideDuration(int duration) override;
|
|
|
| // The number of cycles remaining until the animation stops.
|
| void set_cycles_remaining(int value) { cycles_remaining_ = value; }
|
| @@ -43,7 +43,7 @@ class GFX_EXPORT ThrobAnimation : public SlideAnimation {
|
|
|
| protected:
|
| // Overriden to continually throb (assuming we're throbbing).
|
| - virtual void Step(base::TimeTicks time_now) OVERRIDE;
|
| + virtual void Step(base::TimeTicks time_now) override;
|
|
|
| private:
|
| // Resets state such that we behave like SlideAnimation.
|
|
|