Index: ui/app_list/pagination_controller.cc |
diff --git a/ui/app_list/pagination_controller.cc b/ui/app_list/pagination_controller.cc |
index b05357635d266765b7d00f1bd8a3985c40b19af9..654f15407bf3073c849c6c1f6b8711e637ea739c 100644 |
--- a/ui/app_list/pagination_controller.cc |
+++ b/ui/app_list/pagination_controller.cc |
@@ -23,8 +23,7 @@ const double kFinishTransitionThreshold = 0.33; |
PaginationController::PaginationController(PaginationModel* model, |
ScrollAxis scroll_axis) |
- : pagination_model_(model), scroll_axis_(scroll_axis) { |
-} |
+ : pagination_model_(model), scroll_axis_(scroll_axis) {} |
bool PaginationController::OnScroll(const gfx::Vector2d& offset, |
ScrollEventType type) { |
@@ -42,11 +41,9 @@ bool PaginationController::OnScroll(const gfx::Vector2d& offset, |
// Do not scroll on very small events. |
// TODO(calamity): This should only apply on touchpad scroll but touchpad |
// events are coming in as mousewheel events. See https://crbug.com/594264. |
- if (abs(offset_magnitude) > kMinScrollToSwitchPage) { |
- if (!pagination_model_->has_transition()) { |
- pagination_model_->SelectPageRelative(offset_magnitude > 0 ? -1 : 1, |
- true); |
- } |
+ if (abs(offset_magnitude) > kMinScrollToSwitchPage && |
+ !pagination_model_->has_transition()) { |
+ pagination_model_->SelectPageRelative(offset_magnitude > 0 ? -1 : 1, true); |
return true; |
} |