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

Unified Diff: chrome/browser/ui/views/download/download_shelf_view.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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
Index: chrome/browser/ui/views/download/download_shelf_view.h
diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h
index c0c6307ec48011a6c2d63bb50d62781176954e10..68a559bad2691b0ce88fc9b474da5274cdc395ff 100644
--- a/chrome/browser/ui/views/download/download_shelf_view.h
+++ b/chrome/browser/ui/views/download/download_shelf_view.h
@@ -10,7 +10,7 @@
#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"
@@ -25,7 +25,7 @@ class DownloadItem;
class PageNavigator;
}
-namespace ui {
+namespace gfx {
class SlideAnimation;
}
@@ -40,7 +40,7 @@ class ImageView;
// 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,
@@ -63,9 +63,9 @@ class DownloadShelfView : public views::AccessiblePaneView,
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.
@@ -142,10 +142,10 @@ class DownloadShelfView : public views::AccessiblePaneView,
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.
« no previous file with comments | « chrome/browser/ui/views/download/download_item_view.cc ('k') | chrome/browser/ui/views/download/download_shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698