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

chrome/browser/ui/views/download/download_item_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.
 //
 // A ChromeView that implements one download on the Download shelf.
 // Each DownloadItemView contains an application icon, a text label
 // indicating the download's file name, a text label indicating the
 // download's status (such as the number of bytes downloaded so far)
 // and a button for canceling an in progress download, or opening
 // the completed download.
@@ skipping 11 matching lines @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_util.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/download_manager.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 #include "ui/gfx/font_list.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 
 class DownloadShelfView;
 class DownloadShelfContextMenuView;
 
 namespace gfx {
 class Image;
 class ImageSkia;
-}
-
-namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
 class Label;
 class LabelButton;
 }
 
 class DownloadItemView : public views::ButtonListener,
                          public views::View,
                          public views::ContextMenuController,
                          public content::DownloadItem::Observer,
-                         public ui::AnimationDelegate {
+                         public gfx::AnimationDelegate {
  public:
   DownloadItemView(content::DownloadItem* download,
                    DownloadShelfView* parent);
   virtual ~DownloadItemView();
 
   // Timer callback for handling animations
   void UpdateDownloadProgress();
   void StartDownloadProgress();
   void StopDownloadProgress();
 
@@ skipping 28 matching lines @@
 
   // Overridden from views::ContextMenuController.
   virtual void ShowContextMenuForView(View* source,
                                       const gfx::Point& point,
                                       ui::MenuSourceType source_type) OVERRIDE;
 
   // ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
-  // ui::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate implementation.
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
 
  protected:
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   enum State {
     NORMAL = 0,
     HOT,
     PUSHED
@@ skipping 97 matching lines @@
   // so that screenreaders can access the filename, status text, and
   // dangerous download warning message (if any).
   void UpdateAccessibleName();
 
   // Update the location of the drop down button.
   void UpdateDropDownButtonPosition();
 
   // Show/Hide/Reset |animation| based on the state transition specified by
   // |from| and |to|.
   void AnimateStateTransition(State from, State to,
-                              ui::SlideAnimation* animation);
+                              gfx::SlideAnimation* animation);
 
   // The different images used for the background.
   BodyImageSet normal_body_image_set_;
   BodyImageSet hot_body_image_set_;
   BodyImageSet pushed_body_image_set_;
   BodyImageSet dangerous_mode_body_image_set_;
   BodyImageSet malicious_mode_body_image_set_;
   DropDownImageSet normal_drop_down_image_set_;
   DropDownImageSet hot_drop_down_image_set_;
   DropDownImageSet pushed_drop_down_image_set_;
@@ skipping 45 matching lines @@
   // Position that a possible drag started at.
   gfx::Point drag_start_point_;
 
   // For canceling an in progress icon request.
   CancelableTaskTracker cancelable_task_tracker_;
 
   // A model class to control the status text we display.
   DownloadItemModel model_;
 
   // Hover animations for our body and drop buttons.
-  scoped_ptr<ui::SlideAnimation> body_hover_animation_;
-  scoped_ptr<ui::SlideAnimation> drop_hover_animation_;
+  scoped_ptr<gfx::SlideAnimation> body_hover_animation_;
+  scoped_ptr<gfx::SlideAnimation> drop_hover_animation_;
 
   // Animation for download complete.
-  scoped_ptr<ui::SlideAnimation> complete_animation_;
+  scoped_ptr<gfx::SlideAnimation> complete_animation_;
 
   // Progress animation
   base::RepeatingTimer<DownloadItemView> progress_timer_;
 
   // Dangerous mode buttons.
   views::LabelButton* save_button_;
   views::LabelButton* discard_button_;
 
   // Dangerous mode label.
   views::Label* dangerous_download_label_;
@@ skipping 22 matching lines @@
 
   // The icon loaded in the download shelf is based on the file path of the
   // item.  Store the path used, so that we can detect a change in the path
   // and reload the icon.
   base::FilePath last_download_item_path_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItemView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_DOWNLOAD_DOWNLOAD_ITEM_VIEW_H__