app_list: Make over scroll animation faster.

- Add an over scroll animation duration of 50ms;
- Use the over scroll animation duration for transition to invalid page
  (i.e. over scroll); This was using normal page transition duration of 180ms
  before.
- Use the same duration for snap back animation; This was 100ms and now changed
  to 50ms.

Also fixed a bug that app launcher bubble moves to wrong location if starting an
over scroll before previous over scroll snap back animation finishes.

BUG=160590
TEST=Verify over scroll animation is fast enough.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11275320

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167784 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/ui/app_list/pagination_model.h b/ui/app_list/pagination_model.h
index d51241af..9f27e42 100644
--- a/ui/app_list/pagination_model.h
+++ b/ui/app_list/pagination_model.h
@@ -59,7 +59,7 @@ class APP_LIST_EXPORT PaginationModel : public ui::AnimationDelegate {
   void SelectPageRelative(int delta, bool animate);
 
   void SetTransition(const Transition& transition);
-  void SetTransitionDuration(int duration_ms);
+  void SetTransitionDurations(int duration_ms, int overscroll_duration_ms);
 
   // Starts a scroll transition. If there is a running transition animation,
   // cancels it but keeps the transition info.
@@ -108,8 +108,7 @@ class APP_LIST_EXPORT PaginationModel : public ui::AnimationDelegate {
   // -1 or |total_pages_| is returned to indicate the situation.
   int CalculateTargetPage(int delta) const;
 
-  void StartTranstionAnimation(int target_page);
-  void CreateTransitionAnimation();
+  void StartTransitionAnimation(const Transition& transition);
   void ResetTransitionAnimation();
 
   // ui::AnimationDelegate overrides:
@@ -128,6 +127,7 @@ class APP_LIST_EXPORT PaginationModel : public ui::AnimationDelegate {
 
   scoped_ptr<ui::SlideAnimation> transition_animation_;
   int transition_duration_ms_;  // Transition duration in millisecond.
+  int overscroll_transition_duration_ms_;
 
   ObserverList<PaginationModelObserver> observers_;