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

Unified Diff: ui/gfx/animation/throb_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/animation/slide_animation.h ('k') | ui/gfx/color_analysis.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ui/gfx/animation/slide_animation.h ('k') | ui/gfx/color_analysis.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698