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

chrome/browser/ui/views/dropdown_bar_host.h

 // Copyright (c) 2011 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_DROPDOWN_BAR_HOST_H_
 #define CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_
 
 #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"
 #include "ui/views/focus/focus_manager.h"
 
 class BrowserView;
 class DropdownBarHostDelegate;
 class DropdownBarView;
 
 namespace content {
 class WebContents;
 }
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
-}  // namespace ui
+}  // namespace gfx
 
 namespace views {
 class ExternalFocusTracker;
 class View;
 class Widget;
 }  // namespace views
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The DropdownBarHost implements the container widget for the UI that
 // is shown at the top of browser contents. It uses the appropriate
 // implementation from dropdown_bar_host_win.cc or dropdown_bar_host_aura.cc to
 // draw its content and is responsible for showing, hiding, animating, closing,
 // and moving the bar if needed, for example if the widget is
 // obscuring the selection results in FindBar.
 //
 ////////////////////////////////////////////////////////////////////////////////
 class DropdownBarHost : public ui::AcceleratorTarget,
                         public views::FocusChangeListener,
-                        public ui::AnimationDelegate {
+                        public gfx::AnimationDelegate {
  public:
   explicit DropdownBarHost(BrowserView* browser_view);
   virtual ~DropdownBarHost();
 
   // Initializes the DropdownBarHost. This creates the widget that |view| paints
   // into.
   // |host_view| is the view whose position in the |browser_view_| view
   // hierarchy determines the z-order of the widget relative to views with
   // layers and views with associated NativeViews.
   void Init(views::View* host_view,
@@ skipping 25 matching lines @@
   // Overridden from views::FocusChangeListener:
   virtual void OnWillChangeFocus(views::View* focused_before,
                                  views::View* focused_now) OVERRIDE;
   virtual void OnDidChangeFocus(views::View* focused_before,
                                 views::View* focused_now) OVERRIDE;
 
   // Overridden from 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
   // having to poll it while it animates to open/closed status.
   static bool disable_animations_during_testing_;
 
   // Returns the browser view that the dropdown belongs to.
   BrowserView* browser_view() const { return browser_view_; }
 
   // Registers this class as the handler for when Escape is pressed. Once we
@@ skipping 49 matching lines @@
 
   // Allows implementation to tweak widget position.
   void SetWidgetPositionNative(const gfx::Rect& new_pos, bool no_redraw);
 
   // Returns a keyboard event suitable for forwarding.
   content::NativeWebKeyboardEvent GetKeyboardEvent(
       const content::WebContents* contents,
       const ui::KeyEvent& key_event);
 
   // Returns the animation for the dropdown.
-  ui::SlideAnimation* animation() {
+  gfx::SlideAnimation* animation() {
     return animation_.get();
   }
 
  private:
   // Set the view whose position in the |browser_view_| view hierarchy
   // determines the z-order of |host_| relative to views with layers and
   // views with associated NativeViews.
   void SetHostViewNative(views::View* host_view);
 
   // The BrowserView that created us.
   BrowserView* browser_view_;
 
   // Our view, which is responsible for drawing the UI.
   views::View* view_;
   DropdownBarHostDelegate* delegate_;
 
   // The y position pixel offset of the widget while animating the
   // dropdown widget.
   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_;
 
   // True if the accelerator target for Esc key is registered.
   bool esc_accel_target_registered_;
 
   // Tracks and stores the last focused view which is not the DropdownBarView
   // or any of its children. Used to restore focus once the DropdownBarView is
   // closed.
   scoped_ptr<views::ExternalFocusTracker> focus_tracker_;
 
   // Host is the Widget implementation that is created and maintained by the
   // dropdown bar. It contains the DropdownBarView.
   scoped_ptr<views::Widget> host_;
 
   // A flag to manually manage visibility. GTK/X11 is asynchronous and
   // the state of the widget can be out of sync.
   bool is_visible_;
 
   DISALLOW_COPY_AND_ASSIGN(DropdownBarHost);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_