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_); |