Index: ui/gfx/animation/animation_container.cc |
diff --git a/ui/gfx/animation/animation_container.cc b/ui/gfx/animation/animation_container.cc |
index d8290b2eef6d9ae19960dbf99cb72da60658c6ea..e06803d06e18d2dbeb52c0a02706c6805df0ef15 100644 |
--- a/ui/gfx/animation/animation_container.cc |
+++ b/ui/gfx/animation/animation_container.cc |
@@ -6,7 +6,6 @@ |
#include "ui/gfx/animation/animation_container_element.h" |
#include "ui/gfx/animation/animation_container_observer.h" |
-#include "ui/gfx/frame_time.h" |
using base::TimeDelta; |
using base::TimeTicks; |
@@ -14,8 +13,7 @@ using base::TimeTicks; |
namespace gfx { |
AnimationContainer::AnimationContainer() |
- : last_tick_time_(gfx::FrameTime::Now()), |
- observer_(NULL) { |
+ : last_tick_time_(base::TimeTicks::Now()), observer_(NULL) { |
} |
AnimationContainer::~AnimationContainer() { |
@@ -29,7 +27,7 @@ void AnimationContainer::Start(AnimationContainerElement* element) { |
// element isn't running. |
if (elements_.empty()) { |
- last_tick_time_ = gfx::FrameTime::Now(); |
+ last_tick_time_ = base::TimeTicks::Now(); |
SetMinTimerInterval(element->GetTimerInterval()); |
} else if (element->GetTimerInterval() < min_timer_interval_) { |
SetMinTimerInterval(element->GetTimerInterval()); |
@@ -62,7 +60,7 @@ void AnimationContainer::Run() { |
// ourself here to make sure we're still valid after running all the elements. |
scoped_refptr<AnimationContainer> this_ref(this); |
- TimeTicks current_time = gfx::FrameTime::Now(); |
+ TimeTicks current_time = base::TimeTicks::Now(); |
last_tick_time_ = current_time; |