| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/app_list/views/contents_view.h" | 5 #include "ui/app_list/views/contents_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "grit/ui_resources.h" | |
| 12 #include "ui/app_list/app_list_constants.h" | 11 #include "ui/app_list/app_list_constants.h" |
| 13 #include "ui/app_list/app_list_switches.h" | 12 #include "ui/app_list/app_list_switches.h" |
| 14 #include "ui/app_list/app_list_view_delegate.h" | 13 #include "ui/app_list/app_list_view_delegate.h" |
| 15 #include "ui/app_list/views/app_list_folder_view.h" | 14 #include "ui/app_list/views/app_list_folder_view.h" |
| 16 #include "ui/app_list/views/app_list_main_view.h" | 15 #include "ui/app_list/views/app_list_main_view.h" |
| 17 #include "ui/app_list/views/apps_container_view.h" | 16 #include "ui/app_list/views/apps_container_view.h" |
| 18 #include "ui/app_list/views/apps_grid_view.h" | 17 #include "ui/app_list/views/apps_grid_view.h" |
| 19 #include "ui/app_list/views/contents_switcher_view.h" | 18 #include "ui/app_list/views/contents_switcher_view.h" |
| 20 #include "ui/app_list/views/search_result_list_view.h" | 19 #include "ui/app_list/views/search_result_list_view.h" |
| 21 #include "ui/app_list/views/start_page_view.h" | 20 #include "ui/app_list/views/start_page_view.h" |
| 22 #include "ui/events/event.h" | 21 #include "ui/events/event.h" |
| 22 #include "ui/resources/grit/ui_resources.h" |
| 23 #include "ui/views/view_model.h" | 23 #include "ui/views/view_model.h" |
| 24 #include "ui/views/view_model_utils.h" | 24 #include "ui/views/view_model_utils.h" |
| 25 | 25 |
| 26 namespace app_list { | 26 namespace app_list { |
| 27 | 27 |
| 28 namespace { | 28 namespace { |
| 29 | 29 |
| 30 const int kMinMouseWheelToSwitchPage = 20; | 30 const int kMinMouseWheelToSwitchPage = 20; |
| 31 const int kMinScrollToSwitchPage = 20; | 31 const int kMinScrollToSwitchPage = 20; |
| 32 const int kMinHorizVelocityToSwitchPage = 800; | 32 const int kMinHorizVelocityToSwitchPage = 800; |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 if (std::abs(offset) > kMinScrollToSwitchPage) { | 397 if (std::abs(offset) > kMinScrollToSwitchPage) { |
| 398 if (!GetAppsPaginationModel()->has_transition()) { | 398 if (!GetAppsPaginationModel()->has_transition()) { |
| 399 GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true); | 399 GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true); |
| 400 } | 400 } |
| 401 event->SetHandled(); | 401 event->SetHandled(); |
| 402 event->StopPropagation(); | 402 event->StopPropagation(); |
| 403 } | 403 } |
| 404 } | 404 } |
| 405 | 405 |
| 406 } // namespace app_list | 406 } // namespace app_list |
| OLD | NEW |