ui/base/animation -> ui/gfx/animation

ui/app_list/pagination_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/pagination_model.h"
 
 #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 {
 
 PaginationModel::PaginationModel()
     : total_pages_(-1),
       selected_page_(-1),
       transition_(-1, 0),
       pending_selected_page_(-1),
       transition_duration_ms_(0),
       overscroll_transition_duration_ms_(0),
@@ skipping 193 matching lines @@
 
   return std::max(start_page, std::min(end_page, target_page));
 }
 
 void PaginationModel::StartTransitionAnimation(const Transition& transition) {
   DCHECK(selected_page_ != transition.target_page);
 
   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) ?
       transition_duration_ms_ : overscroll_transition_duration_ms_;
   if (duration)
     transition_animation_->SetSlideDuration(duration);
 
   transition_animation_->Show();
 }
 
 void PaginationModel::ResetTransitionAnimation() {
   transition_animation_.reset();
   transition_.target_page = -1;
   transition_.progress = 0;
   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_;
 
   if (transition_animation_->GetCurrentValue() == 1) {
     // Showing animation ends.
     if (!is_valid_page(transition_.target_page)) {
       // If target page is not in valid range, reverse the animation.
       transition_animation_->Hide();
       return;
     }
 
     // Otherwise, change page and finish the transition.
     DCHECK(selected_page_ != transition_.target_page);
     SelectPage(transition_.target_page, false /* animate */);
   } else if (transition_animation_->GetCurrentValue() == 0) {
     // Hiding animation ends. No page change should happen.
     ResetTransitionAnimation();
   }
 
   if (next_target >= 0)
     SelectPage(next_target, true);
 }
 
 }  // namespace app_list