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

Unified Diff: ui/app_list/views/apps_container_view.cc

Issue 573703003: Make experimental app launcher show 4 rows of apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dragging_without_grid_resize
Patch Set: ensure centered app list height remains correct when the virtual keyboard is shown Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: ui/app_list/views/apps_container_view.cc
diff --git a/ui/app_list/views/apps_container_view.cc b/ui/app_list/views/apps_container_view.cc
index 4d6fdaba35dd99961639d1c1970218efaf9edf9f..bd29cb8fde5066a43a89af8ae7ae0a1c95544004 100644
--- a/ui/app_list/views/apps_container_view.cc
+++ b/ui/app_list/views/apps_container_view.cc
@@ -28,10 +28,12 @@ AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
apps_grid_view_ = new AppsGridView(app_list_main_view);
int cols = kPreferredCols;
int rows = kPreferredRows;
- // ShouldCenterWindow also implies that it is wide instead of tall.
- if (app_list_main_view->ShouldCenterWindow()) {
+ if (switches::IsExperimentalAppListEnabled()) {
cols = kExperimentalPreferredCols;
rows = kExperimentalPreferredRows;
+ } else if (app_list_main_view->ShouldCenterWindow()) {
+ cols = kCenteredPreferredCols;
+ rows = kCenteredPreferredRows;
}
Matt Giuca 2014/09/16 06:39:40 optional nit: I think I would prefer declaring the
calamity 2014/09/16 06:55:12 Done.
apps_grid_view_->SetLayout(cols, rows);
AddChildView(apps_grid_view_);
« ui/app_list/views/app_list_view_unittest.cc ('K') | « ui/app_list/views/app_list_view_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698