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

chrome/browser/ui/views/dropdown_bar_host.h

Index: chrome/browser/ui/views/dropdown_bar_host.h
diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
index b9d2689eb0a79f1b32eef10c67249f33b05472ec..935866a3d7544006b7522129327ea9127d1cd1f4 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.h
+++ b/chrome/browser/ui/views/dropdown_bar_host.h
@@ -8,7 +8,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ -22,9 +22,9 @@ namespace content {
 class WebContents;
 }
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
-}  // namespace ui
+}  // namespace gfx
 
 namespace views {
 class ExternalFocusTracker;
@@ -44,7 +44,7 @@ class Widget;
 ////////////////////////////////////////////////////////////////////////////////
 class DropdownBarHost : public ui::AcceleratorTarget,
                         public views::FocusChangeListener,
-                        public ui::AnimationDelegate {
+                        public gfx::AnimationDelegate {
  public:
   explicit DropdownBarHost(BrowserView* browser_view);
   virtual ~DropdownBarHost();
@@ -90,9 +90,9 @@ class DropdownBarHost : public ui::AcceleratorTarget,
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) = 0;
   virtual bool CanHandleAccelerators() const = 0;
 
-  // ui::AnimationDelegate implementation:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate implementation:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // During testing we can disable animations by setting this flag to true,
   // so that opening and closing the dropdown bar is shown instantly, instead of
@@ -162,7 +162,7 @@ class DropdownBarHost : public ui::AcceleratorTarget,
       const ui::KeyEvent& key_event);
 
   // Returns the animation for the dropdown.
-  ui::SlideAnimation* animation() {
+  gfx::SlideAnimation* animation() {
     return animation_.get();
   }
 
@@ -184,7 +184,7 @@ class DropdownBarHost : public ui::AcceleratorTarget,
   int animation_offset_;
 
   // The animation class to use when opening the Dropdown widget.
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
 
   // The focus manager we register with to keep track of focus changes.
   views::FocusManager* focus_manager_;