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

ash/system/tray/tray_item_view.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 ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_
 #define ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_
 
 #include "ash/ash_export.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/view.h"
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 
 namespace views {
 class ImageView;
 class Label;
 }
 
 namespace ash {
 
 class SystemTrayItem;
 
 namespace internal {
 
 // Base-class for items in the tray. It makes sure the widget is updated
 // correctly when the visibility/size of the tray item changes. It also adds
 // animation when showing/hiding the item in the tray.
 class ASH_EXPORT TrayItemView : public views::View,
-                                public ui::AnimationDelegate {
+                                public gfx::AnimationDelegate {
  public:
   explicit TrayItemView(SystemTrayItem* owner);
   virtual ~TrayItemView();
 
   static void DisableAnimationsForTest();
 
   // Convenience function for creating a child Label or ImageView.
   void CreateLabel();
   void CreateImageView();
 
@@ skipping 17 matching lines @@
   // not allow GetPreferredSize to be overridden.
   virtual gfx::Size DesiredSize();
 
   // The default animation duration is 200ms. But each view can customize this.
   virtual int GetAnimationDurationMS();
 
  private:
   // Overridden from views::View.
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
 
-  // 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;
 
   SystemTrayItem* owner_;
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
   views::Label* label_;
   views::ImageView* image_view_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayItemView);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_ITEM_VIEW_H_