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

ash/drag_drop/drag_drop_controller_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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
-#include "ui/base/animation/linear_animation.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/gestures/gesture_types.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/gfx/animation/linear_animation.h"
 #include "ui/gfx/image/image_skia_rep.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "ui/views/view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/native_widget_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
@@ skipping 86 matching lines @@
     return ui::DragDropTypes::DRAG_COPY;
   }
 
   virtual void OnDragDone() OVERRIDE {
     drag_done_received_ = true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(DragTestView);
 };
 
-class CompletableLinearAnimation : public ui::LinearAnimation {
+class CompletableLinearAnimation : public gfx::LinearAnimation {
  public:
   CompletableLinearAnimation(int duration,
                              int frame_rate,
-                             ui::AnimationDelegate* delegate)
-      : ui::LinearAnimation(duration, frame_rate, delegate),
+                             gfx::AnimationDelegate* delegate)
+      : gfx::LinearAnimation(duration, frame_rate, delegate),
         duration_(duration) {
   }
 
   void Complete() {
     Step(start_time() + base::TimeDelta::FromMilliseconds(duration_));
   }
 
  private:
   int duration_;
 };
@@ skipping 35 matching lines @@
                     const ui::LocatedEvent& event) OVERRIDE {
     DragDropController::Drop(target, event);
     drop_received_ = true;
   }
 
   virtual void DragCancel() OVERRIDE {
     DragDropController::DragCancel();
     drag_canceled_ = true;
   }
 
-  virtual ui::LinearAnimation* CreateCancelAnimation(
+  virtual gfx::LinearAnimation* CreateCancelAnimation(
       int duration,
       int frame_rate,
-      ui::AnimationDelegate* delegate) OVERRIDE {
+      gfx::AnimationDelegate* delegate) OVERRIDE {
     return new CompletableLinearAnimation(duration, frame_rate, delegate);
   }
 
   virtual void DoDragCancel(int animation_duration_ms) OVERRIDE {
     DragDropController::DoDragCancel(animation_duration_ms);
     drag_canceled_ = true;
   }
 
   bool drag_start_received_;
   int num_drag_updates_;
@@ skipping 891 matching lines @@
     EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
   }
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::client::SetDragDropClient(*iter, NULL);
   }
 }
 
 }  // namespace test
 }  // namespace aura