Revert of Replace AllAppsTileItemView with ArrowExpandView

ui/app_list/views/suggestions_container_view.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/app_list/views/suggestions_container_view.h"
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_features.h"
 #include "ui/app_list/views/all_apps_tile_item_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace app_list {
 
 namespace {
 
 constexpr int kTileSpacing = 7;
 constexpr int kNumTilesCols = 5;
 constexpr int kTilesHorizontalMarginLeft = 145;
+constexpr int kCenterColumnOfStartPageAppGrid = 3;
 
 }  // namespace
 
 SuggestionsContainerView::SuggestionsContainerView(
     ContentsView* contents_view,
     AllAppsTileItemView* all_apps_button)
     : contents_view_(contents_view),
       all_apps_button_(all_apps_button),
       is_fullscreen_app_list_enabled_(features::IsFullscreenAppListEnabled()) {
   DCHECK(contents_view);
@@ skipping 107 matching lines @@
         new SearchResultTileItemView(this, view_delegate_);
     if (i % kNumTilesCols == 0)
       tiles_layout_manager->StartRow(0, 0);
     tiles_layout_manager->AddView(tile_item);
     AddChildView(tile_item);
     tile_item->SetParentBackgroundColor(kLabelBackgroundColor);
     tile_item->SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
     search_result_tile_views_.emplace_back(tile_item);
   }
 
-  if (all_apps_button_ && !is_fullscreen_app_list_enabled_) {
+  if (all_apps_button_)
     all_apps_button_->UpdateIcon();
-
+  if (is_fullscreen_app_list_enabled_) {
+    // Also add a special "all apps" button to the middle of the next row of the
+    // container.
+    tiles_layout_manager->StartRow(0, 0);
+    tiles_layout_manager->SkipColumns(kCenterColumnOfStartPageAppGrid);
+  } else {
     // Also add a special "all apps" button to the end of the next row of the
     // container.
     if (i % kNumTilesCols == 0)
       tiles_layout_manager->StartRow(0, 0);
+  }
 
+  if (all_apps_button_) {
     tiles_layout_manager->AddView(all_apps_button_);
     AddChildView(all_apps_button_);
   }
 }
 
 }  // namespace app_list