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

ui/message_center/views/toast_contents_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 UI_MESSAGE_CENTER_VIEWS_TOAST_CONTENTS_VIEW_H_
 #define UI_MESSAGE_CENTER_VIEWS_TOAST_CONTENTS_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.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/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/views/widget/widget_delegate.h"
 
-namespace ui {
+namespace gfx {
 class Animation;
 class SlideAnimation;
 }
 
 namespace views {
 class View;
 }
 
 namespace message_center {
 
 class MessageCenter;
 class MessagePopupCollection;
 class MessageView;
 class Notification;
 
 
 class ToastContentsView : public views::WidgetDelegateView,
-                          public ui::AnimationDelegate {
+                          public gfx::AnimationDelegate {
  public:
   ToastContentsView(const Notification* notification,
                     base::WeakPtr<MessagePopupCollection> collection,
                     MessageCenter* message_center);
   virtual ~ToastContentsView();
 
   // Initialization and update.
   views::Widget* CreateWidget(gfx::NativeView parent);
   void SetContents(MessageView* view);
 
@@ skipping 18 matching lines @@
   static gfx::Size GetToastSizeForView(views::View* view);
 
   // Overridden from views::View:
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  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;
 
   // Overridden from views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual bool CanActivate() const OVERRIDE;
   virtual void OnDisplayChanged() OVERRIDE;
   virtual void OnWorkAreaChanged() OVERRIDE;
 
   // Given the bounds of a toast on the screen, compute the bouds for that
   // toast in 'closed' state. The 'closed' state is used as origin/destination
   // in reveal/closing animations.
   gfx::Rect GetClosedToastBounds(gfx::Rect bounds);
 
   void StartFadeIn();
   void StartFadeOut();  // Will call Widget::Close() when animation ends.
-  void OnBoundsAnimationEndedOrCancelled(const ui::Animation* animation);
+  void OnBoundsAnimationEndedOrCancelled(const gfx::Animation* animation);
 
   base::WeakPtr<MessagePopupCollection> collection_;
   MessageCenter* message_center_;
 
   // Id if the corresponding Notification.
   std::string id_;
 
-  scoped_ptr<ui::SlideAnimation> bounds_animation_;
-  scoped_ptr<ui::SlideAnimation> fade_animation_;
+  scoped_ptr<gfx::SlideAnimation> bounds_animation_;
+  scoped_ptr<gfx::SlideAnimation> fade_animation_;
 
   bool is_animating_bounds_;
   gfx::Rect animated_bounds_start_;
   gfx::Rect animated_bounds_end_;
   // Started closing animation, will close at the end.
   bool is_closing_;
   // Closing animation - when it ends, close the widget. Weak, only used
   // for referential equality.
-  ui::Animation* closing_animation_;
+  gfx::Animation* closing_animation_;
 
   gfx::Point origin_;
   gfx::Size preferred_size_;
 
   DISALLOW_COPY_AND_ASSIGN(ToastContentsView);
 };
 
 }  // namespace message_center
 
 #endif // UI_MESSAGE_CENTER_VIEWS_TOAST_CONTENTS_VIEW_H_