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

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

 // Copyright 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_
 
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 
 #include "base/timer/timer.h"
 #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"
 
 class BrowserView;
 class BookmarkBarView;
 
 namespace aura {
 class Window;
 }
 
 namespace gfx {
+class SlideAnimation;
 class Transform;
 }
 
 namespace ui {
 class Layer;
 class LocatedEvent;
-class SlideAnimation;
 }
 
 namespace views {
 class View;
 }
 
 class ImmersiveModeControllerAsh : public ImmersiveModeController,
                                    public content::NotificationObserver,
-                                   public ui::AnimationDelegate,
+                                   public gfx::AnimationDelegate,
                                    public ui::EventHandler,
                                    public views::FocusChangeListener,
                                    public views::WidgetObserver,
                                    public aura::WindowObserver {
  public:
   ImmersiveModeControllerAsh();
   virtual ~ImmersiveModeControllerAsh();
 
   // These methods are used to increment and decrement |revealed_lock_count_|.
   // If immersive mode is enabled, a transition from 1 to 0 in
@@ skipping 35 matching lines @@
   virtual void OnWillChangeFocus(views::View* focused_before,
                                  views::View* focused_now) OVERRIDE;
   virtual void OnDidChangeFocus(views::View* focused_before,
                                 views::View* focused_now) OVERRIDE;
 
   // views::WidgetObserver overrides:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
   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,
                                        const void* key,
                                        intptr_t old) OVERRIDE;
   virtual void OnAddTransientChild(aura::Window* window,
                                    aura::Window* transient) OVERRIDE;
   virtual void OnRemoveTransientChild(aura::Window* window,
                                       aura::Window* transient) OVERRIDE;
 
@@ skipping 176 matching lines @@
 
   // Lock which keeps the top-of-window views revealed based on the focused view
   // and the active widget. Acquiring the lock never triggers a reveal because
   // a view is not focusable till a reveal has made it visible.
   scoped_ptr<ImmersiveRevealedLock> focus_revealed_lock_;
 
   // Native window for the browser.
   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_;
 
   // Manages bubbles which are anchored to a child of |top_container_|.
   class BubbleManager;
   scoped_ptr<BubbleManager> bubble_manager_;
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<ImmersiveModeControllerAsh> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ImmersiveModeControllerAsh);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_IMMERSIVE_MODE_CONTROLLER_ASH_H_