| 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_;
|
|
|