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

Unified Diff: ui/app_list/contents_view.cc

Issue 11275320: app_list: Make over scroll animation faster. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/apps_grid_view_unittest.cc ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/contents_view.cc
diff --git a/ui/app_list/contents_view.cc b/ui/app_list/contents_view.cc
index cbb4c2a0f9762ebb631c7f406c39cfb932f6f989..f5e703015331870917f8cf631a05747f552fb336 100644
--- a/ui/app_list/contents_view.cc
+++ b/ui/app_list/contents_view.cc
@@ -6,6 +6,7 @@
#include <algorithm>
+#include "ui/app_list/app_list_constants.h"
#include "ui/app_list/app_list_view.h"
#include "ui/app_list/apps_grid_view.h"
#include "ui/app_list/pagination_model.h"
@@ -32,7 +33,6 @@ const int kMinScrollToSwitchPage = 20;
const int kMinHorizVelocityToSwitchPage = 800;
const double kFinishTransitionThreshold = 0.33;
-const int kTransitionAnimationDurationInMs = 180;
// Helpers to get certain child view from |model|.
AppsGridView* GetAppsGridView(views::ViewModel* model) {
@@ -53,7 +53,9 @@ ContentsView::ContentsView(AppListView* app_list_view,
view_model_(new views::ViewModel),
ALLOW_THIS_IN_INITIALIZER_LIST(
bounds_animator_(new views::BoundsAnimator(this))) {
- pagination_model_->SetTransitionDuration(kTransitionAnimationDurationInMs);
+ pagination_model_->SetTransitionDurations(
+ kPageTransitionDurationInMs,
+ kOverscrollPageTransitionDurationMs);
AppsGridView* apps_grid_view = new AppsGridView(app_list_view,
pagination_model);
« no previous file with comments | « ui/app_list/apps_grid_view_unittest.cc ('k') | ui/app_list/pagination_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698