| Index: ui/compositor/layer_animator_collection.cc
|
| diff --git a/ui/compositor/layer_animator_collection.cc b/ui/compositor/layer_animator_collection.cc
|
| index babdcb6f6b2bb0b2ba8f7992f2aebdaa96009d76..42dee6c259dd31f0ceb8d03df46bd7ad4daa7de4 100644
|
| --- a/ui/compositor/layer_animator_collection.cc
|
| +++ b/ui/compositor/layer_animator_collection.cc
|
| @@ -9,12 +9,11 @@
|
| #include "base/time/time.h"
|
| #include "ui/compositor/compositor.h"
|
| #include "ui/compositor/layer_animator.h"
|
| -#include "ui/gfx/frame_time.h"
|
|
|
| namespace ui {
|
|
|
| LayerAnimatorCollection::LayerAnimatorCollection(Compositor* compositor)
|
| - : compositor_(compositor), last_tick_time_(gfx::FrameTime::Now()) {
|
| + : compositor_(compositor), last_tick_time_(base::TimeTicks::Now()) {
|
| }
|
|
|
| LayerAnimatorCollection::~LayerAnimatorCollection() {
|
| @@ -26,7 +25,7 @@ void LayerAnimatorCollection::StartAnimator(
|
| scoped_refptr<LayerAnimator> animator) {
|
| DCHECK_EQ(0U, animators_.count(animator));
|
| if (!animators_.size())
|
| - last_tick_time_ = gfx::FrameTime::Now();
|
| + last_tick_time_ = base::TimeTicks::Now();
|
| animators_.insert(animator);
|
| if (animators_.size() == 1U && compositor_)
|
| compositor_->AddAnimationObserver(this);
|
|
|