Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3843)

Unified Diff: chrome/browser/ui/views/download_item_view.h

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/download_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/download_item_view.h
===================================================================
--- chrome/browser/ui/views/download_item_view.h (revision 70685)
+++ chrome/browser/ui/views/download_item_view.h (working copy)
@@ -19,7 +19,6 @@
#include <string>
-#include "app/animation_delegate.h"
#include "base/basictypes.h"
#include "base/scoped_ptr.h"
#include "base/time.h"
@@ -29,24 +28,29 @@
#include "chrome/browser/download/download_manager.h"
#include "chrome/browser/icon_manager.h"
#include "gfx/font.h"
+#include "ui/base/animation/animation_delegate.h"
#include "views/event.h"
#include "views/controls/button/button.h"
#include "views/view.h"
-namespace views {
-class Label;
-class NativeButton;
-}
class BaseDownloadItemModel;
class DownloadShelfView;
class SkBitmap;
class DownloadShelfContextMenuWin;
+
+namespace ui {
class SlideAnimation;
+}
+namespace views {
+class Label;
+class NativeButton;
+}
+
class DownloadItemView : public views::ButtonListener,
public views::View,
public DownloadItem::Observer,
- public AnimationDelegate {
+ public ui::AnimationDelegate {
public:
DownloadItemView(DownloadItem* download,
DownloadShelfView* parent,
@@ -75,8 +79,8 @@
// ButtonListener implementation.
virtual void ButtonPressed(views::Button* sender, const views::Event& event);
- // AnimationDelegate implementation.
- virtual void AnimationProgressed(const Animation* animation);
+ // ui::AnimationDelegate implementation.
+ virtual void AnimationProgressed(const ui::Animation* animation);
// Timer callback for handling animations
void UpdateDownloadProgress();
@@ -231,11 +235,11 @@
scoped_ptr<BaseDownloadItemModel> model_;
// Hover animations for our body and drop buttons.
- scoped_ptr<SlideAnimation> body_hover_animation_;
- scoped_ptr<SlideAnimation> drop_hover_animation_;
+ scoped_ptr<ui::SlideAnimation> body_hover_animation_;
+ scoped_ptr<ui::SlideAnimation> drop_hover_animation_;
// Animation for download complete.
- scoped_ptr<SlideAnimation> complete_animation_;
+ scoped_ptr<ui::SlideAnimation> complete_animation_;
// Progress animation
base::RepeatingTimer<DownloadItemView> progress_timer_;
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698