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

Unified Diff: ui/gfx/animation/slide_animation.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/multi_animation.h ('k') | ui/gfx/animation/throb_animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/slide_animation.h
diff --git a/ui/gfx/animation/slide_animation.h b/ui/gfx/animation/slide_animation.h
index 3795e368141191dddcd21b2caea4f328794acc10..58effac3f1d02eb8b84894887b297619d9ca9f14 100644
--- a/ui/gfx/animation/slide_animation.h
+++ b/ui/gfx/animation/slide_animation.h
@@ -47,7 +47,7 @@ namespace gfx {
class GFX_EXPORT SlideAnimation : public LinearAnimation {
public:
explicit SlideAnimation(AnimationDelegate* target);
- virtual ~SlideAnimation();
+ ~SlideAnimation() override;
// Set the animation back to the 0 state.
virtual void Reset();
@@ -66,7 +66,7 @@ class GFX_EXPORT SlideAnimation : public LinearAnimation {
int GetSlideDuration() const { return slide_duration_; }
void SetTweenType(Tween::Type tween_type) { tween_type_ = tween_type; }
- virtual double GetCurrentValue() const override;
+ double GetCurrentValue() const override;
bool IsShowing() const { return showing_; }
bool IsClosing() const { return !showing_ && value_end_ < value_current_; }
@@ -74,7 +74,7 @@ class GFX_EXPORT SlideAnimation : public LinearAnimation {
private:
// Overridden from Animation.
- virtual void AnimateToState(double state) override;
+ void AnimateToState(double state) override;
AnimationDelegate* target_;
« no previous file with comments | « ui/gfx/animation/multi_animation.h ('k') | ui/gfx/animation/throb_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698