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

ash/wm/workspace/phantom_window_controller.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/wm/workspace/phantom_window_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 
 namespace ash {
 namespace internal {
 
@@ skipping 109 matching lines @@
   }
   if (phantom_widget_start_ &&
       (phantom_widget_start_->GetNativeWindow()->GetRootWindow() != start_root
        || start_root == target_root)) {
     phantom_widget_start_->Close();
     phantom_widget_start_ = NULL;
   }
   if (!phantom_widget_start_ && start_root != target_root)
     phantom_widget_start_ = CreatePhantomWidget(start_root, start_bounds_);
 
-  animation_.reset(new ui::SlideAnimation(this));
-  animation_->SetTweenType(ui::Tween::EASE_IN);
+  animation_.reset(new gfx::SlideAnimation(this));
+  animation_->SetTweenType(gfx::Tween::EASE_IN);
   const int kAnimationDurationMS = 200;
   animation_->SetSlideDuration(kAnimationDurationMS);
   animation_->Show();
 }
 
 void PhantomWindowController::Hide() {
   if (phantom_widget_)
     phantom_widget_->Close();
   phantom_widget_ = NULL;
   if (phantom_widget_start_)
     phantom_widget_start_->Close();
   phantom_widget_start_ = NULL;
 }
 
 bool PhantomWindowController::IsShowing() const {
   return phantom_widget_ != NULL;
 }
 
 void PhantomWindowController::AnimationProgressed(
-    const ui::Animation* animation) {
+    const gfx::Animation* animation) {
   const gfx::Rect current_bounds =
       animation->CurrentValueBetween(start_bounds_, bounds_in_screen_);
   if (phantom_widget_start_)
     phantom_widget_start_->SetBounds(current_bounds);
   phantom_widget_->SetBounds(current_bounds);
 }
 
 views::Widget* PhantomWindowController::CreatePhantomWidget(
     aura::RootWindow* root_window,
     const gfx::Rect& bounds_in_screen) {
@@ skipping 28 matching lines @@
   // Fade the window in.
   ui::Layer* widget_layer = phantom_widget->GetNativeWindow()->layer();
   widget_layer->SetOpacity(0);
   ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator());
   widget_layer->SetOpacity(1);
   return phantom_widget;
 }
 
 }  // namespace internal
 }  // namespace ash