summaryrefslogtreecommitdiffstats
path: root/app/animation.h
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 21:48:18 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 21:48:18 +0000
commitff7c7ed36be6942c7cb88ded9894f4e0faf5d58c (patch)
tree52a4b67ab286a67e1f9789a900ced14904152783 /app/animation.h
parent4a6d55db2d03a33c35e205e85d4b610ed88ce64f (diff)
downloadchromium_src-ff7c7ed36be6942c7cb88ded9894f4e0faf5d58c.zip
chromium_src-ff7c7ed36be6942c7cb88ded9894f4e0faf5d58c.tar.gz
chromium_src-ff7c7ed36be6942c7cb88ded9894f4e0faf5d58c.tar.bz2
More animation cleanup.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5154006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/animation.h')
-rw-r--r--app/animation.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/animation.h b/app/animation.h
index 06ccf52..87dc43f 100644
--- a/app/animation.h
+++ b/app/animation.h
@@ -6,7 +6,7 @@
#define APP_ANIMATION_H_
#pragma once
-#include "app/animation_container.h"
+#include "app/animation_container_element.h"
#include "base/ref_counted.h"
#include "base/time.h"
@@ -14,6 +14,7 @@ namespace gfx {
class Rect;
}
+class AnimationContainer;
class AnimationDelegate;
// Base class used in implementing animations. You only need use this class if
@@ -22,7 +23,7 @@ class AnimationDelegate;
//
// To subclass override Step, which is invoked as the animation progresses and
// GetCurrentValue() to return the value appropriate to the animation.
-class Animation : public AnimationContainer::Element {
+class Animation : public AnimationContainerElement {
public:
explicit Animation(base::TimeDelta timer_interval);
virtual ~Animation();