ui/app_list/views/contents_view.cc - Issue 11784034: Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac".

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11784034: Skeleton for app_list on OSX, and refactoring for enable_app_list=1 on OS=="mac". (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase for 175876 and 175961 Created 7 years, 11 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

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/views/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"

11 #include "ui/app_list/apps_grid_view.h"

12 #include "ui/app_list/pagination_model.h"	10 #include "ui/app_list/pagination_model.h"

13 #include "ui/app_list/search_result_list_view.h"	11 #include "ui/app_list/views/app_list_view.h"

	12 #include "ui/app_list/views/apps_grid_view.h"

	13 #include "ui/app_list/views/search_result_list_view.h"

14 #include "ui/base/events/event.h"	14 #include "ui/base/events/event.h"

15 #include "ui/views/animation/bounds_animator.h"	15 #include "ui/views/animation/bounds_animator.h"

16 #include "ui/views/view_model.h"	16 #include "ui/views/view_model.h"

17 #include "ui/views/view_model_utils.h"	17 #include "ui/views/view_model_utils.h"

18	18

19 namespace app_list {	19 namespace app_list {

20	20

21 namespace {	21 namespace {

22	22

23 const int kPreferredIconDimension = 48;	23 const int kPreferredIconDimension = 48;

(...skipping 203 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 event->SetHandled();	233 event->SetHandled();

234 }	234 }

235	235

236 } // namespace app_list	236 } // namespace app_list

OLD	NEW

« no previous file with comments | « ui/app_list/views/contents_view.h ('k') | ui/app_list/views/page_switcher.h » ('j') | no next file with comments »