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

chrome/browser/ui/views/notifications/balloon_view_views.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_VIEWS_NOTIFICATIONS_BALLOON_VIEW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_NOTIFICATIONS_BALLOON_VIEW_VIEWS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/widget/widget_delegate.h"
 
 class BalloonCollection;
 class BalloonViewHost;
 class NotificationOptionsMenuModel;
 
 namespace gfx {
 class Path;
-}
-
-namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
 class ImageButton;
 class Label;
 class MenuButton;
 class MenuRunner;
 }
 
 // A balloon view is the UI component for a desktop notification toast.
 // It draws a border, and within the border an HTML renderer.
 class BalloonViewImpl : public BalloonView,
                         public views::MenuButtonListener,
                         public views::WidgetDelegateView,
                         public views::ButtonListener,
                         public content::NotificationObserver,
-                        public ui::AnimationDelegate {
+                        public gfx::AnimationDelegate {
  public:
   explicit BalloonViewImpl(BalloonCollection* collection);
   virtual ~BalloonViewImpl();
 
   // BalloonView interface.
   virtual void Show(Balloon* balloon) OVERRIDE;
   virtual void Update() OVERRIDE;
   virtual void RepositionToBalloon() OVERRIDE;
   virtual void Close(bool by_user) OVERRIDE;
   virtual gfx::Size GetSize() const OVERRIDE;
@@ skipping 18 matching lines @@
 
   // views::ButtonListener interface.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event&) OVERRIDE;
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // ui::AnimationDelegate interface.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate interface.
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // Initializes the options menu.
   void CreateOptionsMenu();
 
   // Masks the contents to fit within the frame.
   void GetContentsMask(const gfx::Rect& contents_rect, gfx::Path* path) const;
 
   // Masks the frame for the rounded corners of the shadow-bubble.
   void GetFrameMask(const gfx::Rect&, gfx::Path* path) const;
 
@@ skipping 41 matching lines @@
   // The renderer of the HTML contents.
   scoped_ptr<BalloonViewHost> html_contents_;
 
   // Pointer to sub-view is owned by the View sub-class.
   views::ImageButton* close_button_;
 
   // Pointer to sub-view is owned by View class.
   views::Label* source_label_;
 
   // An animation to move the balloon on the screen as its position changes.
-  scoped_ptr<ui::SlideAnimation> animation_;
+  scoped_ptr<gfx::SlideAnimation> animation_;
   gfx::Rect anim_frame_start_;
   gfx::Rect anim_frame_end_;
 
   // The options menu.
   scoped_ptr<NotificationOptionsMenuModel> options_menu_model_;
   scoped_ptr<views::MenuRunner> menu_runner_;
   views::MenuButton* options_menu_button_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // Set to true if this is browser generate web UI.
   bool enable_web_ui_;
 
   // Most recent value passed to Close().
   bool closed_by_user_;
 
   DISALLOW_COPY_AND_ASSIGN(BalloonViewImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_NOTIFICATIONS_BALLOON_VIEW_VIEWS_H_