diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 08:31:07 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-01 08:31:07 +0000 |
commit | 6386a4bf66060345f7dbcb975b9f950cce2552c2 (patch) | |
tree | 61f948ce3ba01481e5d1fda82760a64f5dc23d90 /ui/base/animation | |
parent | 2c9382375f1bcea32b7fdbf165fffdd39e046f0b (diff) | |
download | chromium_src-6386a4bf66060345f7dbcb975b9f950cce2552c2.zip chromium_src-6386a4bf66060345f7dbcb975b9f950cce2552c2.tar.gz chromium_src-6386a4bf66060345f7dbcb975b9f950cce2552c2.tar.bz2 |
ui: Fix clang warnings about missing virtual and OVERRIDE annotations.
BUG=115047
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10905053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/animation')
-rw-r--r-- | ui/base/animation/animation_container_unittest.cc | 2 | ||||
-rw-r--r-- | ui/base/animation/animation_unittest.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/base/animation/animation_container_unittest.cc b/ui/base/animation/animation_container_unittest.cc index 55b53e5..45beeed 100644 --- a/ui/base/animation/animation_container_unittest.cc +++ b/ui/base/animation/animation_container_unittest.cc @@ -33,7 +33,7 @@ class TestAnimation : public LinearAnimation { : LinearAnimation(20, 20, delegate) { } - virtual void AnimateToState(double state) { + virtual void AnimateToState(double state) OVERRIDE { } private: diff --git a/ui/base/animation/animation_unittest.cc b/ui/base/animation/animation_unittest.cc index 3961aae..a2321c4 100644 --- a/ui/base/animation/animation_unittest.cc +++ b/ui/base/animation/animation_unittest.cc @@ -29,7 +29,7 @@ class RunAnimation : public LinearAnimation { : LinearAnimation(frame_rate, delegate) { } - virtual void AnimateToState(double state) { + 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) { + 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) { + 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) { + virtual void AnimationEnded(const Animation* animation) OVERRIDE { delete animation; MessageLoop::current()->Quit(); } |