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

Unified Diff: ui/gfx/animation/animation_unittest.cc

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/animation_container_unittest.cc ('k') | ui/gfx/animation/linear_animation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/animation_unittest.cc
diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc
index 00f1e2626c1946755573a2cfc212855a06ee61d2..d86f87af51ad4eb29b4e133e72f5a7bbc3557753 100644
--- a/ui/gfx/animation/animation_unittest.cc
+++ b/ui/gfx/animation/animation_unittest.cc
@@ -29,7 +29,7 @@ class RunAnimation : public LinearAnimation {
: LinearAnimation(frame_rate, delegate) {
}
- virtual void AnimateToState(double state) OVERRIDE {
+ virtual void AnimateToState(double state) override {
EXPECT_LE(0.0, state);
EXPECT_GE(1.0, state);
}
@@ -44,7 +44,7 @@ class CancelAnimation : public LinearAnimation {
: LinearAnimation(duration, frame_rate, delegate) {
}
- virtual void AnimateToState(double state) OVERRIDE {
+ virtual void AnimateToState(double state) override {
if (state >= 0.5)
Stop();
}
@@ -59,7 +59,7 @@ class EndAnimation : public LinearAnimation {
: LinearAnimation(duration, frame_rate, delegate) {
}
- virtual void AnimateToState(double state) OVERRIDE {
+ virtual void AnimateToState(double state) override {
if (state >= 0.5)
End();
}
@@ -71,7 +71,7 @@ class EndAnimation : public LinearAnimation {
// AnimationDelegate implementation that deletes the animation in ended.
class DeletingAnimationDelegate : public AnimationDelegate {
public:
- virtual void AnimationEnded(const Animation* animation) OVERRIDE {
+ virtual void AnimationEnded(const Animation* animation) override {
delete animation;
base::MessageLoop::current()->Quit();
}
« no previous file with comments | « ui/gfx/animation/animation_container_unittest.cc ('k') | ui/gfx/animation/linear_animation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698