Center and change the aspect ratio for the experimental app list. [Win]

ui/app_list/views/apps_container_view.cc

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 ee8a033fe1e045d963c9ee40287f917c38968ef4..877a9cf6fdab56eeed9d2b9406e1672b6bfb071a 100644
--- a/ui/app_list/views/apps_container_view.cc
+++ b/ui/app_list/views/apps_container_view.cc
@@ -6,8 +6,10 @@
 
 #include <algorithm>
 
+#include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_folder_item.h"
+#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_item_view.h"
@@ -119,9 +121,14 @@ AppsContainerView::AppsContainerView(AppListMainView* app_list_main_view,
       show_state_(SHOW_APPS) {
   apps_grid_view_ = new AppsGridView(
       app_list_main_view, pagination_model, start_page_contents);
-  apps_grid_view_->SetLayout(kPreferredIconDimension,
-                             kPreferredCols,
-                             kPreferredRows);
+  int cols = kPreferredCols;
+  int rows = kPreferredRows;
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      app_list::switches::kEnableExperimentalAppList)) {
+    cols = kExperimentalPreferredCols;
+    rows = kExperimentalPreferredRows;
+  }
+  apps_grid_view_->SetLayout(kPreferredIconDimension, cols, rows);
   AddChildView(apps_grid_view_);
 
   app_list_folder_view_ = new AppListFolderView(