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

Unified Diff: chrome/browser/ui/views/download_shelf_view.cc

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
Index: chrome/browser/ui/views/download_shelf_view.cc
===================================================================
--- chrome/browser/ui/views/download_shelf_view.cc (revision 70685)
+++ chrome/browser/ui/views/download_shelf_view.cc (working copy)
@@ -8,7 +8,6 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "app/slide_animation.h"
#include "base/logging.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/download/download_item.h"
@@ -23,6 +22,7 @@
#include "gfx/canvas.h"
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
+#include "ui/base/animation/slide_animation.h"
#include "views/background.h"
#include "views/controls/button/image_button.h"
#include "views/controls/image_view.h"
@@ -120,10 +120,10 @@
UpdateButtonColors();
AddChildView(close_button_);
- new_item_animation_.reset(new SlideAnimation(this));
+ new_item_animation_.reset(new ui::SlideAnimation(this));
new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
- shelf_animation_.reset(new SlideAnimation(this));
+ shelf_animation_.reset(new ui::SlideAnimation(this));
shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
Show();
}
@@ -224,7 +224,7 @@
return prefsize;
}
-void DownloadShelfView::AnimationProgressed(const Animation *animation) {
+void DownloadShelfView::AnimationProgressed(const ui::Animation *animation) {
if (animation == new_item_animation_.get()) {
Layout();
SchedulePaint();
@@ -239,7 +239,7 @@
}
}
-void DownloadShelfView::AnimationEnded(const Animation *animation) {
+void DownloadShelfView::AnimationEnded(const ui::Animation *animation) {
if (animation == shelf_animation_.get()) {
parent_->SetDownloadShelfVisible(shelf_animation_->IsShowing());
if (!shelf_animation_->IsShowing())
« no previous file with comments | « chrome/browser/ui/views/download_shelf_view.h ('k') | chrome/browser/ui/views/download_started_animation_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698