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

Unified Diff: ui/compositor/float_animation_curve_adapter.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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/base/animation/tween.cc ('k') | ui/compositor/float_animation_curve_adapter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/float_animation_curve_adapter.h
diff --git a/ui/compositor/float_animation_curve_adapter.h b/ui/compositor/float_animation_curve_adapter.h
index 0e073aaa73fc3d9b57c0e2a61f51cc9063b409ec..9959772769f972f51b5ff0a15031a9185dd4f491 100644
--- a/ui/compositor/float_animation_curve_adapter.h
+++ b/ui/compositor/float_animation_curve_adapter.h
@@ -7,13 +7,13 @@
#include "base/time/time.h"
#include "cc/animation/animation_curve.h"
-#include "ui/base/animation/tween.h"
+#include "ui/gfx/animation/tween.h"
namespace ui {
class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve {
public:
- FloatAnimationCurveAdapter(Tween::Type tween_type,
+ FloatAnimationCurveAdapter(gfx::Tween::Type tween_type,
float initial_value,
float target_value,
base::TimeDelta duration);
@@ -26,7 +26,7 @@ class FloatAnimationCurveAdapter : public cc::FloatAnimationCurve {
virtual float GetValue(double t) const OVERRIDE;
private:
- Tween::Type tween_type_;
+ gfx::Tween::Type tween_type_;
float initial_value_;
float target_value_;
base::TimeDelta duration_;
« no previous file with comments | « ui/base/animation/tween.cc ('k') | ui/compositor/float_animation_curve_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698