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

chrome/browser/ui/views/download/download_shelf_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 CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/download/download_shelf.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/mouse_watcher.h"
 
 class Browser;
 class BrowserView;
 class DownloadItemView;
 
 namespace content {
 class DownloadItem;
 class PageNavigator;
 }
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 
 namespace views {
 class ImageButton;
 class ImageView;
 }
 
 // DownloadShelfView is a view that contains individual views for each download,
 // as well as a close button and a link to show all downloads.
 //
 // DownloadShelfView does not hold an infinite number of download views, rather
 // it'll automatically remove views once a certain point is reached.
 class DownloadShelfView : public views::AccessiblePaneView,
-                          public ui::AnimationDelegate,
+                          public gfx::AnimationDelegate,
                           public DownloadShelf,
                           public views::ButtonListener,
                           public views::LinkListener,
                           public views::MouseWatcherListener {
  public:
   DownloadShelfView(Browser* browser, BrowserView* parent);
   virtual ~DownloadShelfView();
 
   // Sent from the DownloadItemView when the user opens an item.
   void OpenedDownload(DownloadItemView* view);
 
   // Returns the relevant containing object that can load pages.
   // i.e. the |browser_|.
   content::PageNavigator* GetNavigator();
 
   // Implementation of View.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
-  // Implementation of ui::AnimationDelegate.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // Implementation of gfx::AnimationDelegate.
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   // Implementation of views::LinkListener.
   // Invoked when the user clicks the 'show all downloads' link button.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // Implementation of ButtonListener.
   // Invoked when the user clicks the close button. Asks the browser to
   // hide the download shelf.
   virtual void ButtonPressed(views::Button* button,
                              const ui::Event& event) OVERRIDE;
@@ skipping 56 matching lines @@
   void SchedulePaintForDownloadItem(views::View* view);
 
   // Get the rect that perfectly surrounds a DownloadItemView so we can
   // draw a focus rect around it.
   gfx::Rect GetFocusRectBounds(const DownloadItemView* download_item_view);
 
   // The browser for this shelf.
   Browser* browser_;
 
   // The animation for adding new items to the shelf.
-  scoped_ptr<ui::SlideAnimation> new_item_animation_;
+  scoped_ptr<gfx::SlideAnimation> new_item_animation_;
 
   // The show/hide animation for the shelf itself.
-  scoped_ptr<ui::SlideAnimation> shelf_animation_;
+  scoped_ptr<gfx::SlideAnimation> shelf_animation_;
 
   // The download views. These are also child Views, and deleted when
   // the DownloadShelfView is deleted.
   std::vector<DownloadItemView*> download_views_;
 
   // An image displayed on the right of the "Show all downloads..." link.
   views::ImageView* arrow_image_;
 
   // Link for showing all downloads. This is contained as a child, and deleted
   // by View.
   views::Link* show_all_view_;
 
   // Button for closing the downloads. This is contained as a child, and
   // deleted by View.
   views::ImageButton* close_button_;
 
   // The window this shelf belongs to.
   BrowserView* parent_;
 
   views::MouseWatcher mouse_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_SHELF_VIEW_H_