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

Unified Diff: ui/app_list/pagination_model.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
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | ui/app_list/views/app_list_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/pagination_model.cc
diff --git a/ui/app_list/pagination_model.cc b/ui/app_list/pagination_model.cc
index 2bf69020ab87950d110cba73853c6bbd9bbe135a..02a4179d2193281c7e87176d6fcd480015a92697 100644
--- a/ui/app_list/pagination_model.cc
+++ b/ui/app_list/pagination_model.cc
@@ -7,7 +7,7 @@
#include <algorithm>
#include "ui/app_list/pagination_model_observer.h"
-#include "ui/base/animation/slide_animation.h"
+#include "ui/gfx/animation/slide_animation.h"
namespace app_list {
@@ -221,8 +221,8 @@ void PaginationModel::StartTransitionAnimation(const Transition& transition) {
NotifyTransitionStarted();
SetTransition(transition);
- transition_animation_.reset(new ui::SlideAnimation(this));
- transition_animation_->SetTweenType(ui::Tween::LINEAR);
+ transition_animation_.reset(new gfx::SlideAnimation(this));
+ transition_animation_->SetTweenType(gfx::Tween::LINEAR);
transition_animation_->Reset(transition_.progress);
const int duration = is_valid_page(transition_.target_page) ?
@@ -240,12 +240,12 @@ void PaginationModel::ResetTransitionAnimation() {
pending_selected_page_ = -1;
}
-void PaginationModel::AnimationProgressed(const ui::Animation* animation) {
+void PaginationModel::AnimationProgressed(const gfx::Animation* animation) {
transition_.progress = transition_animation_->GetCurrentValue();
NotifyTransitionChanged();
}
-void PaginationModel::AnimationEnded(const ui::Animation* animation) {
+void PaginationModel::AnimationEnded(const gfx::Animation* animation) {
// Save |pending_selected_page_| because SelectPage resets it.
int next_target = pending_selected_page_;
« no previous file with comments | « ui/app_list/pagination_model.h ('k') | ui/app_list/views/app_list_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698