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

chrome/browser/ui/gtk/tabs/dragged_view_gtk.h

 // Copyright (c) 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_GTK_TABS_DRAGGED_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_TABS_DRAGGED_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 class DragData;
 class TabRendererGtk;
 
-class DraggedViewGtk : public ui::AnimationDelegate {
+class DraggedViewGtk : public gfx::AnimationDelegate {
  public:
   DraggedViewGtk(DragData* drag_data,
                 const gfx::Point& mouse_tab_offset,
                 const gfx::Size& contents_size);
   virtual ~DraggedViewGtk();
 
   // Moves the attached dragged view to the appropriate location.
   // |tabstrip_point| is the location of the upper left corner of the dragged
   // view in screen coordinates.
   void MoveAttachedTo(const gfx::Point& tabstrip_point);
@@ skipping 50 matching lines @@
   // Returns the width occupied in the tabstrip from the left most point
   // (regardless of RTL or LTR mode) of the dragged view up to the mouse pointer
   // when the drag was initiated.
   int GetWidthInTabStripUpToMousePointer();
 
   // Returns the distance from the start of the tabstrip (left, regardless of
   // RTL) up to the position of the mouse pointer.
   gfx::Point GetDistanceFromTabStripOriginToMousePointer();
 
  private:
-  // Overridden from ui::AnimationDelegate:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
+  // Overridden from gfx::AnimationDelegate:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE;
 
   // Arranges the contents of the dragged tab.
   void Layout();
 
   // Gets the preferred size of the dragged tab.
   gfx::Size GetPreferredSize();
 
   // Resizes the container to fit the content for the current attachment mode.
   void ResizeContainer();
 
@@ skipping 58 matching lines @@
   gfx::Point mouse_tab_offset_;
 
   // The size of the tab renderer when the dragged tab is attached to a
   // tabstrip.
   gfx::Size attached_tab_size_;
 
   // The dimensions of the WebContents being dragged.
   gfx::Size contents_size_;
 
   // The animation used to slide the attached tab to its final location.
-  ui::SlideAnimation close_animation_;
+  gfx::SlideAnimation close_animation_;
 
   // A callback notified when the animation is complete.
   base::Closure animation_callback_;
 
   // The start and end bounds of the animation sequence.
   gfx::Rect animation_start_bounds_;
   gfx::Rect animation_end_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(DraggedViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_TABS_DRAGGED_VIEW_GTK_H_