Make experimental app launcher show 4 rows of apps.

This CL changes the number of rows in the experimental app launcher's
grid view from 3 to 4.

BUG=411775

Review URL: https://codereview.chromium.org/573703003

Cr-Commit-Position: refs/heads/master@{#295026}

ui/app_list/app_list_constants.cc

@@ -67,9 +67,13 @@ const int kGridIconDimension = 48;
 const int kListIconSize = 32;
 const int kTileIconSize = 48;
 
+// Preferred number of columns and rows in the centered app list apps grid.
+const int kCenteredPreferredCols = 6;
+const int kCenteredPreferredRows = 3;
+
 // Preferred number of columns and rows in the experimental app list apps grid.
 const int kExperimentalPreferredCols = 6;
-const int kExperimentalPreferredRows = 3;
+const int kExperimentalPreferredRows = 4;
 
 // Radius of the circle, in which if entered, show re-order preview.
 const int kReorderDroppingCircleRadius = 35;

ui/app_list/app_list_constants.h

@@ -51,6 +51,9 @@ APP_LIST_EXPORT extern const int kGridIconDimension;
 APP_LIST_EXPORT extern const int kListIconSize;
 APP_LIST_EXPORT extern const int kTileIconSize;
 
+APP_LIST_EXPORT extern const int kCenteredPreferredCols;
+APP_LIST_EXPORT extern const int kCenteredPreferredRows;
+
 APP_LIST_EXPORT extern const int kExperimentalPreferredCols;
 APP_LIST_EXPORT extern const int kExperimentalPreferredRows;
 

ui/app_list/views/app_list_view_unittest.cc

@@ -238,6 +238,13 @@ void AppListViewTestContext::RunDisplayTest() {
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
 
   Show();
+
+  // The landscape app launcher needs to be short enough to accomodate the
+  // virtual keyboard because it is enabled by default when the virtual keyboard
+  // is enabled.
+  if (test_type_ == LANDSCAPE)
+    EXPECT_GE(403, view_->bounds().height());
+
   if (is_landscape())
     EXPECT_EQ(2, GetPaginationModel()->total_pages());
   else

ui/app_list/views/apps_container_view.cc

@@ -26,12 +26,17 @@ AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
       show_state_(SHOW_NONE),
       top_icon_animation_pending_count_(0) {
   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()) {
+  int cols;
+  int rows;
+  if (switches::IsExperimentalAppListEnabled()) {
     cols = kExperimentalPreferredCols;
     rows = kExperimentalPreferredRows;
+  } else if (app_list_main_view->ShouldCenterWindow()) {
+    cols = kCenteredPreferredCols;
+    rows = kCenteredPreferredRows;
+  } else {
+    cols = kPreferredCols;
+    rows = kPreferredRows;
   }
   apps_grid_view_->SetLayout(cols, rows);
   AddChildView(apps_grid_view_);