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

chrome/browser/ui/gtk/notifications/balloon_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.
 
 // Draws the view for the balloons.
 
 #ifndef CHROME_BROWSER_UI_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/notifications/balloon_view_host_gtk.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/base/animation/animation_delegate.h"
 #include "ui/base/gtk/gtk_signal.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 class BalloonCollection;
 class CustomDrawButton;
 class GtkThemeService;
 class MenuGtk;
 class NotificationOptionsMenuModel;
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 
 // A balloon view is the UI component for desktop notification toasts.
 // It draws a border, and within the border an HTML renderer.
 class BalloonViewImpl : public BalloonView,
                         public MenuGtk::Delegate,
                         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;
   virtual BalloonHost* GetHost() const OVERRIDE;
 
   // MenuGtk::Delegate interface.
   virtual void StoppedShowing() OVERRIDE;
 
  private:
   // 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;
 
   // Do the delayed close work.  The balloon and all view components will be
   // destroyed at this time, so it shouldn't be called while still processing
   // an event that relies on them.
   void DelayedClose(bool by_user);
 
   // The height of the balloon's shelf.
   // The shelf is where is close button is located.
   int GetShelfHeight() const;
 
@@ skipping 38 matching lines @@
   // The renderer of the HTML contents.
   scoped_ptr<BalloonViewHost> html_contents_;
 
   // The following factory is used to call methods at a later time.
   base::WeakPtrFactory<BalloonViewImpl> weak_factory_;
 
   // Close button.
   scoped_ptr<CustomDrawButton> close_button_;
 
   // 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<MenuGtk> options_menu_;
   scoped_ptr<NotificationOptionsMenuModel> options_menu_model_;
   // The button to open the options menu.
   scoped_ptr<CustomDrawButton> options_menu_button_;
 
   content::NotificationRegistrar notification_registrar_;
 
   // Is the menu currently showing?
   bool menu_showing_;
 
   // Is there a pending system-initiated close?
   bool pending_close_;
 
   DISALLOW_COPY_AND_ASSIGN(BalloonViewImpl);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_NOTIFICATIONS_BALLOON_VIEW_GTK_H_