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

Unified Diff: chrome/browser/ui/views/download/download_started_animation_views.cc

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_started_animation_views.cc
diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc
index 80252bd575df704872762737847ba7570a57dea1..31d6879962dc1a632919e2a00589805ee560bcf5 100644
--- a/chrome/browser/ui/views/download/download_started_animation_views.cc
+++ b/chrome/browser/ui/views/download/download_started_animation_views.cc
@@ -12,8 +12,8 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
#include "grit/theme_resources.h"
-#include "ui/base/animation/linear_animation.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/animation/linear_animation.h"
#include "ui/gfx/rect.h"
#include "ui/views/controls/image_view.h"
#include "ui/views/widget/widget.h"
@@ -38,7 +38,7 @@ namespace {
// provided on the constructor, while simultaneously fading it out. To use,
// simply call "new DownloadStartAnimation"; the class cleans itself up when it
// finishes animating.
-class DownloadStartedAnimationWin : public ui::LinearAnimation,
+class DownloadStartedAnimationWin : public gfx::LinearAnimation,
public content::NotificationObserver,
public views::ImageView {
public:
@@ -80,7 +80,7 @@ class DownloadStartedAnimationWin : public ui::LinearAnimation,
DownloadStartedAnimationWin::DownloadStartedAnimationWin(
WebContents* web_contents)
- : ui::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL),
+ : gfx::LinearAnimation(kMoveTimeMs, kFrameRateHz, NULL),
popup_(NULL),
web_contents_(web_contents) {
static gfx::ImageSkia* kDownloadImage = NULL;
« no previous file with comments | « chrome/browser/ui/views/download/download_shelf_view.cc ('k') | chrome/browser/ui/views/dropdown_bar_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698