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

chrome/browser/ui/gtk/download/download_item_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.
 
 #ifndef CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
 #define CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/download_item.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/animation/slide_animation.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
+#include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 
 class DownloadShelfContextMenuGtk;
 class DownloadShelfGtk;
 class GtkThemeService;
 class NineBox;
 
 namespace gfx {
 class Image;
-}
-
-namespace ui {
 class SlideAnimation;
 }
 
 class DownloadItemGtk : public content::DownloadItem::Observer,
-                        public ui::AnimationDelegate,
+                        public gfx::AnimationDelegate,
                         public content::NotificationObserver {
  public:
   // DownloadItemGtk takes ownership of |download_item_model|.
   DownloadItemGtk(DownloadShelfGtk* parent_shelf,
                   content::DownloadItem* download_item);
 
   // Destroys all widgets belonging to this DownloadItemGtk.
   virtual ~DownloadItemGtk();
 
   // content::DownloadItem::Observer implementation.
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
   virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
   virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE;
 
-  // ui::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate implementation.
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Called when the icon manager has finished loading the icon. We take
   // ownership of |icon_bitmap|.
   void OnLoadSmallIconComplete(gfx::Image* image);
   void OnLoadLargeIconComplete(gfx::Image* image);
@@ skipping 136 matching lines @@
   GtkWidget* dangerous_prompt_;
   GtkWidget* dangerous_image_;
   GtkWidget* dangerous_label_;
 
   // An hbox for holding components of the dangerous download dialog.
   ui::OwnedWidgetGtk dangerous_hbox_;
   int dangerous_hbox_start_width_;
   int dangerous_hbox_full_width_;
 
   // The animation when this item is first added to the shelf.
-  scoped_ptr<ui::SlideAnimation> new_item_animation_;
+  scoped_ptr<gfx::SlideAnimation> new_item_animation_;
 
   // Progress animation.
   base::RepeatingTimer<DownloadItemGtk> progress_timer_;
 
   // Animation for download complete.
-  ui::SlideAnimation complete_animation_;
+  gfx::SlideAnimation complete_animation_;
 
   // The file icon for the download. May be null. The small version is used
   // for display in the shelf; the large version is for use as a drag icon.
   // These icons are owned by the IconManager (owned by the BrowserProcess).
   gfx::Image* icon_small_;
   gfx::Image* icon_large_;
 
   // The last download file path for which we requested an icon.
   base::FilePath icon_filepath_;
 
@@ skipping 11 matching lines @@
 
   // Whether we are currently disabled as part of opening the downloaded file.
   bool disabled_while_opening_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   base::WeakPtrFactory<DownloadItemGtk> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_DOWNLOAD_DOWNLOAD_ITEM_GTK_H_