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

ui/aura/window_unittest.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/aura/window.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 1762 matching lines @@
 TEST_F(WindowTest, SetBoundsInternalShouldCheckTargetBounds) {
   // We cannot short-circuit animations in this test.
   ui::ScopedAnimationDurationScaleMode normal_duration_mode(
       ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);
 
   scoped_ptr<Window> w1(
       CreateTestWindowWithBounds(gfx::Rect(0, 0, 100, 100), root_window()));
 
   EXPECT_FALSE(!w1->layer());
   w1->layer()->GetAnimator()->set_disable_timer_for_test(true);
-  ui::AnimationContainerElement* element = w1->layer()->GetAnimator();
+  gfx::AnimationContainerElement* element = w1->layer()->GetAnimator();
 
   EXPECT_EQ("0,0 100x100", w1->bounds().ToString());
   EXPECT_EQ("0,0 100x100", w1->layer()->GetTargetBounds().ToString());
 
   // Animate to a different position.
   {
     ui::ScopedLayerAnimationSettings settings(w1->layer()->GetAnimator());
     w1->SetBounds(gfx::Rect(100, 100, 100, 100));
   }
 
@@ skipping 939 matching lines @@
     window->SetBounds(gfx::Rect(100, 100, 100, 100));
   }
 
   // Bounds shouldn't immediately have changed.
   EXPECT_EQ("0,0 100x100", window->bounds().ToString());
   EXPECT_FALSE(delegate.bounds_changed());
 
   // Animate to the end, which should notify of the change.
   base::TimeTicks start_time =
       window->layer()->GetAnimator()->last_step_time();
-  ui::AnimationContainerElement* element = window->layer()->GetAnimator();
+  gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
   element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
   EXPECT_TRUE(delegate.bounds_changed());
   EXPECT_NE("0,0 100x100", window->bounds().ToString());
 }
 
 // Verifies the delegate is notified when the actual bounds of the layer
 // change even when the window is not the layer's delegate
 TEST_F(WindowTest, DelegateNotifiedAsBoundsChangeInHiddenLayer) {
   BoundsChangeDelegate delegate;
 
@@ skipping 21 matching lines @@
 
   // Layer delegate is NULL but we should still get bounds changed notification.
   EXPECT_EQ("100,100 110x100", window->GetTargetBounds().ToString());
   EXPECT_TRUE(delegate.bounds_changed());
 
   delegate.clear_bounds_changed();
 
   // Animate to the end: will *not* notify of the change since we are hidden.
   base::TimeTicks start_time =
       window->layer()->GetAnimator()->last_step_time();
-  ui::AnimationContainerElement* element = window->layer()->GetAnimator();
+  gfx::AnimationContainerElement* element = window->layer()->GetAnimator();
   element->Step(start_time + base::TimeDelta::FromMilliseconds(1000));
 
   // No bounds changed notification at the end of animation since layer
   // delegate is NULL.
   EXPECT_FALSE(delegate.bounds_changed());
   EXPECT_NE("0,0 100x100", window->bounds().ToString());
 }
 
 namespace {
 
@@ skipping 249 matching lines @@
     o.ValidateState(index++, params);
 
     w1.reset();
     w2.reset();
   }
 
 }
 
 }  // namespace test
 }  // namespace aura