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

chrome/browser/ui/views/frame/immersive_mode_controller_ash.h

Index: chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
index c904f05f6d25898455f725f2fafd740e1b08d284..09ace227c5c6a2b56229387881405a2c17a263fc 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash.h
@@ -11,8 +11,8 @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/aura/window_observer.h"
-#include "ui/base/animation/animation_delegate.h"
 #include "ui/base/events/event_handler.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/widget/widget_observer.h"
@@ -25,13 +25,13 @@ class Window;
 }
 
 namespace gfx {
+class SlideAnimation;
 class Transform;
 }
 
 namespace ui {
 class Layer;
 class LocatedEvent;
-class SlideAnimation;
 }
 
 namespace views {
@@ -40,7 +40,7 @@ class View;
 
 class ImmersiveModeControllerAsh : public ImmersiveModeController,
                                    public content::NotificationObserver,
-                                   public ui::AnimationDelegate,
+                                   public gfx::AnimationDelegate,
                                    public ui::EventHandler,
                                    public views::FocusChangeListener,
                                    public views::WidgetObserver,
@@ -96,9 +96,9 @@ class ImmersiveModeControllerAsh : public ImmersiveModeController,
   virtual void OnWidgetActivationChanged(views::Widget* widget,
                                          bool active) OVERRIDE;
 
-  // ui::AnimationDelegate overrides:
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate overrides:
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
@@ -295,7 +295,7 @@ class ImmersiveModeControllerAsh : public ImmersiveModeController,
   aura::Window* native_window_;
 
   // The animation which controls sliding the top-of-window views in and out.
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
 
   // Whether the animations are disabled for testing.
   bool animations_disabled_for_test_;