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

ui/app_list/pagination_model.h

 // 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.
 
 #ifndef UI_APP_LIST_PAGINATION_MODEL_H_
 #define UI_APP_LIST_PAGINATION_MODEL_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/app_list/app_list_export.h"
-#include "ui/base/animation/animation_delegate.h"
+#include "ui/gfx/animation/animation_delegate.h"
 
-namespace ui {
+namespace gfx {
 class SlideAnimation;
 }
 
 namespace app_list {
 
 class PaginationModelObserver;
 
 // A simple pagination model that consists of two numbers: the total pages and
 // the currently selected page. The model is a single selection model that at
 // the most one page can become selected at any time.
-class APP_LIST_EXPORT PaginationModel : public ui::AnimationDelegate {
+class APP_LIST_EXPORT PaginationModel : public gfx::AnimationDelegate {
  public:
   // Holds info for transition animation and touch scroll.
   struct Transition {
     Transition(int target_page, double progress)
         : target_page(target_page),
           progress(progress) {
     }
 
     bool Equals(const Transition& rhs) const {
       return target_page == rhs.target_page && progress == rhs.progress;
@@ skipping 68 matching lines @@
   // When there is no transition, current page is the currently selected page.
   // If there is a transition, current page is the transition target page or the
   // pending transition target page. When current page + |delta| goes beyond
   // valid range and |selected_page_| is at the range ends, invalid page number
   // -1 or |total_pages_| is returned to indicate the situation.
   int CalculateTargetPage(int delta) const;
 
   void StartTransitionAnimation(const Transition& transition);
   void ResetTransitionAnimation();
 
-  // ui::AnimationDelegate overrides:
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
-  virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
+  // gfx::AnimationDelegate overrides:
+  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
 
   int total_pages_;
   int selected_page_;
 
   Transition transition_;
 
   // Pending selected page when SelectedPage is called during a transition. If
   // multiple SelectPage is called while a transition is in progress, only the
   // last target page is remembered here.
   int pending_selected_page_;
 
-  scoped_ptr<ui::SlideAnimation> transition_animation_;
+  scoped_ptr<gfx::SlideAnimation> transition_animation_;
   int transition_duration_ms_;  // Transition duration in millisecond.
   int overscroll_transition_duration_ms_;
 
   int last_overscroll_target_page_;
   base::TimeTicks last_overscroll_animation_start_time_;
 
   ObserverList<PaginationModelObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaginationModel);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_PAGINATION_MODEL_H_