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

Side by Side Diff: ui/app_list/views/contents_view.cc

Issue 439703002: Allow app list tiles to show search results in the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "grit/ui_resources.h" 10 #include "grit/ui_resources.h"
11 #include "ui/app_list/app_list_constants.h" 11 #include "ui/app_list/app_list_constants.h"
12 #include "ui/app_list/app_list_switches.h" 12 #include "ui/app_list/app_list_switches.h"
13 #include "ui/app_list/app_list_view_delegate.h" 13 #include "ui/app_list/app_list_view_delegate.h"
14 #include "ui/app_list/views/app_list_folder_view.h" 14 #include "ui/app_list/views/app_list_folder_view.h"
15 #include "ui/app_list/views/app_list_main_view.h" 15 #include "ui/app_list/views/app_list_main_view.h"
16 #include "ui/app_list/views/apps_container_view.h" 16 #include "ui/app_list/views/apps_container_view.h"
17 #include "ui/app_list/views/apps_grid_view.h" 17 #include "ui/app_list/views/apps_grid_view.h"
18 #include "ui/app_list/views/contents_switcher_view.h" 18 #include "ui/app_list/views/contents_switcher_view.h"
19 #include "ui/app_list/views/search_box_view.h"
Matt Giuca 2014/08/06 08:54:53 nit: Is this necessary?
calamity 2014/08/12 05:03:37 Done.
19 #include "ui/app_list/views/search_result_list_view.h" 20 #include "ui/app_list/views/search_result_list_view.h"
20 #include "ui/app_list/views/start_page_view.h" 21 #include "ui/app_list/views/start_page_view.h"
21 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
22 #include "ui/events/event.h" 23 #include "ui/events/event.h"
23 #include "ui/views/view_model.h" 24 #include "ui/views/view_model.h"
24 #include "ui/views/view_model_utils.h" 25 #include "ui/views/view_model_utils.h"
25 26
26 namespace app_list { 27 namespace app_list {
27 28
28 namespace { 29 namespace {
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (std::abs(offset) > kMinScrollToSwitchPage) { 394 if (std::abs(offset) > kMinScrollToSwitchPage) {
394 if (!GetAppsPaginationModel()->has_transition()) { 395 if (!GetAppsPaginationModel()->has_transition()) {
395 GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true); 396 GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
396 } 397 }
397 event->SetHandled(); 398 event->SetHandled();
398 event->StopPropagation(); 399 event->StopPropagation();
399 } 400 }
400 } 401 }
401 402
402 } // namespace app_list 403 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698