ui/base/animation -> ui/gfx/animation

ui/compositor/scoped_layer_animation_settings.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/scoped_layer_animation_settings.h"
 
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
@@ skipping 102 matching lines @@
 
 void ScopedLayerAnimationSettings::SetTransitionDuration(
     base::TimeDelta duration) {
   animator_->transition_duration_ = duration;
 }
 
 base::TimeDelta ScopedLayerAnimationSettings::GetTransitionDuration() const {
   return animator_->transition_duration_;
 }
 
-void ScopedLayerAnimationSettings::SetTweenType(Tween::Type tween_type) {
+void ScopedLayerAnimationSettings::SetTweenType(gfx::Tween::Type tween_type) {
   animator_->set_tween_type(tween_type);
 }
 
-Tween::Type ScopedLayerAnimationSettings::GetTweenType() const {
+gfx::Tween::Type ScopedLayerAnimationSettings::GetTweenType() const {
   return animator_->tween_type();
 }
 
 void ScopedLayerAnimationSettings::SetPreemptionStrategy(
     LayerAnimator::PreemptionStrategy strategy) {
   animator_->set_preemption_strategy(strategy);
 }
 
 LayerAnimator::PreemptionStrategy
 ScopedLayerAnimationSettings::GetPreemptionStrategy() const {
   return animator_->preemption_strategy();
 }
 
 void ScopedLayerAnimationSettings::SetInverselyAnimatedBaseLayer(Layer* base) {
   if (inverse_observer_->layer() && !base) {
       animator_->RemoveObserver(inverse_observer_.get());
   } else if (base && !(inverse_observer_->layer())) {
       animator_->AddObserver(inverse_observer_.get());
   }
   inverse_observer_->SetLayer(base);
 }
 
 void ScopedLayerAnimationSettings::AddInverselyAnimatedLayer(
     Layer* inverse_layer) {
   inverse_observer_->AddInverselyAnimatedLayer(inverse_layer);
 }
 
 }  // namespace ui