| Index: cc/input/top_controls_manager.h
|
| diff --git a/cc/input/top_controls_manager.h b/cc/input/top_controls_manager.h
|
| index 9bc3040d31a0bc746fe842af07f62e598ba135b0..288e99ec253e7c885ef341b0ddb3ac8c118f3da2 100644
|
| --- a/cc/input/top_controls_manager.h
|
| +++ b/cc/input/top_controls_manager.h
|
| @@ -9,13 +9,10 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "cc/input/top_controls_state.h"
|
| #include "cc/layers/layer_impl.h"
|
| +#include "ui/gfx/frame_time.h"
|
| #include "ui/gfx/size.h"
|
| #include "ui/gfx/vector2d_f.h"
|
|
|
| -namespace base {
|
| -class TimeTicks;
|
| -}
|
| -
|
| namespace cc {
|
|
|
| class KeyframedFloatAnimationCurve;
|
| @@ -56,7 +53,7 @@ class CC_EXPORT TopControlsManager
|
| gfx::Vector2dF ScrollBy(const gfx::Vector2dF pending_delta);
|
| void ScrollEnd();
|
|
|
| - gfx::Vector2dF Animate(base::TimeTicks monotonic_time);
|
| + gfx::Vector2dF Animate(gfx::FrameTime monotonic_time);
|
|
|
| protected:
|
| TopControlsManager(TopControlsManagerClient* client,
|
| @@ -69,7 +66,7 @@ class CC_EXPORT TopControlsManager
|
| void ResetAnimations();
|
| void SetupAnimation(AnimationDirection direction);
|
| void StartAnimationIfNecessary();
|
| - bool IsAnimationCompleteAtTime(base::TimeTicks time);
|
| + bool IsAnimationCompleteAtTime(gfx::FrameTime time);
|
|
|
| TopControlsManagerClient* client_; // The client manages the lifecycle of
|
| // this.
|
|
|