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/contents_view.h" | 5 #include "ui/app_list/contents_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ui/app_list/app_list_constants.h" | 9 #include "ui/app_list/app_list_constants.h" |
10 #include "ui/app_list/app_list_view.h" | 10 #include "ui/app_list/app_list_view.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 true); | 212 true); |
213 } | 213 } |
214 event->SetHandled(); | 214 event->SetHandled(); |
215 return; | 215 return; |
216 } | 216 } |
217 default: | 217 default: |
218 break; | 218 break; |
219 } | 219 } |
220 } | 220 } |
221 | 221 |
222 ui::EventResult ContentsView::OnScrollEvent(ui::ScrollEvent* event) { | 222 void ContentsView::OnScrollEvent(ui::ScrollEvent* event) { |
223 if (show_state_ != SHOW_APPS || | 223 if (show_state_ != SHOW_APPS || |
224 event->type() == ui::ET_SCROLL_FLING_CANCEL || | 224 event->type() == ui::ET_SCROLL_FLING_CANCEL || |
225 abs(event->x_offset()) < kMinScrollToSwitchPage) { | 225 abs(event->x_offset()) < kMinScrollToSwitchPage) { |
226 return ui::ER_UNHANDLED; | 226 return; |
227 } | 227 } |
228 | 228 |
229 if (!pagination_model_->has_transition()) { | 229 if (!pagination_model_->has_transition()) { |
230 pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1, | 230 pagination_model_->SelectPageRelative(event->x_offset() > 0 ? -1 : 1, |
231 true); | 231 true); |
232 } | 232 } |
233 return ui::ER_HANDLED; | 233 event->SetHandled(); |
234 } | 234 } |
235 | 235 |
236 } // namespace app_list | 236 } // namespace app_list |
OLD | NEW |