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

chrome/browser/ui/views/panels/panel_stack_view.h

 // Copyright (c) 2013 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_PANELS_PANEL_STACK_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_STACK_VIEW_H_
 
 #include <list>
 #include <map>
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/panels/native_panel_stack_window.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/widget/widget_observer.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/ui/views/panels/taskbar_window_thumbnailer_win.h"
 #include "ui/base/win/hwnd_subclass.h"
 #endif
 
-namespace ui {
+namespace gfx {
 class LinearAnimation;
 }
 namespace views {
 class Widget;
 }
 
 // A native window that acts as the owner of all panels in the stack, in order
 // to make all panels appear as a single window on the taskbar or launcher.
 class PanelStackView : public NativePanelStackWindow,
                        public views::WidgetObserver,
                        public views::WidgetDelegateView,
                        public views::WidgetFocusChangeListener,
 #if defined(OS_WIN)
                        public ui::HWNDMessageFilter,
                        public TaskbarWindowThumbnailerDelegateWin,
 #endif
-                       public ui::AnimationDelegate {
+                       public gfx::AnimationDelegate {
  public:
   explicit PanelStackView(NativePanelStackWindowDelegate* delegate);
   virtual ~PanelStackView();
 
  protected:
   // Overridden from NativePanelStackWindow:
   virtual void Close() OVERRIDE;
   virtual void AddPanel(Panel* panel) OVERRIDE;
   virtual void RemovePanel(Panel* panel) OVERRIDE;
   virtual void MergeWith(NativePanelStackWindow* another) OVERRIDE;
@@ skipping 25 matching lines @@
   virtual void DeleteDelegate() OVERRIDE;
 
   // Overridden from views::WidgetObserver:
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   // Overridden from views::WidgetFocusChangeListener:
   virtual void OnNativeFocusChange(gfx::NativeView focused_before,
                                    gfx::NativeView focused_now) OVERRIDE;
 
   // Overridden from AnimationDelegate:
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // Updates the bounds of panels as specified in batch update data.
   void UpdatePanelsBounds();
 
   // Notifies the delegate that the updates of the panel bounds are completed.
   void NotifyBoundsUpdateCompleted();
 
   // Computes/updates the minimum bounds that could fit all panels.
   gfx::Rect GetStackWindowBounds() const;
   void UpdateStackWindowBounds();
@@ skipping 47 matching lines @@
   // a small window, like collapsed panel.
   scoped_ptr<TaskbarWindowThumbnailerWin> thumbnailer_;
 #endif
 
   // For batch bounds update.
   bool animate_bounds_updates_;
   bool bounds_updates_started_;
   BoundsUpdates bounds_updates_;
 
   // Used to animate the bounds changes at a synchronized pace.
-  scoped_ptr<ui::LinearAnimation> bounds_animator_;
+  scoped_ptr<gfx::LinearAnimation> bounds_animator_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelStackView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PANELS_PANEL_STACK_VIEW_H_