[launcher] Display 5 search result list items in suggestion window.

Bug: 1001708
Change-Id: I036e5546d84a60fc9248f785c1801bc8d88eef57
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1793945
Commit-Queue: Jenny Zhang <jennyz@chromium.org>
Reviewed-by: Tony Yeoman <tby@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#695238}

ash/app_list/views/search_result_list_view.cc

@@ -34,7 +34,6 @@ namespace app_list {
 
 namespace {
 
-constexpr int kMaxResults = 5;
 constexpr base::TimeDelta kImpressionThreshold =
     base::TimeDelta::FromSeconds(3);
 
@@ -137,7 +136,8 @@ SearchResultListView::SearchResultListView(AppListMainView* main_view,
   results_container_->SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::Orientation::kVertical));
 
-  for (int i = 0; i < kMaxResults; ++i) {
+  for (size_t i = 0;
+       i < AppListConfig::instance().max_search_result_list_items(); ++i) {
     search_result_views_.emplace_back(
         new SearchResultView(this, view_delegate_));
     search_result_views_.back()->set_index_in_container(i);

ash/public/cpp/app_list/app_list_config.h

@@ -159,6 +159,10 @@ class ASH_PUBLIC_EXPORT AppListConfig {
 
   size_t max_search_result_tiles() const { return max_search_result_tiles_; }
 
+  size_t max_search_result_list_items() const {
+    return max_search_result_list_items_;
+  }
+
   gfx::Size grid_icon_size() const {
     return gfx::Size(grid_icon_dimension_, grid_icon_dimension_);
   }
@@ -414,6 +418,9 @@ class ASH_PUBLIC_EXPORT AppListConfig {
   // Max number of search result tiles in the launcher suggestion window.
   const size_t max_search_result_tiles_ = 6;
 
+  // Max number of search result list items in the launcher suggestion window.
+  const size_t max_search_result_list_items_ = 5;
+
   DISALLOW_COPY_AND_ASSIGN(AppListConfig);
 };
 

chrome/browser/ui/app_list/search/search_controller_factory.cc

@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/app_list_switches.h"
 #include "base/metrics/field_trial_params.h"
@@ -43,7 +44,6 @@ namespace {
 // in some UI, so we need to allow returning more results than actual maximum
 // number of results to be displayed in UI.
 constexpr size_t kMaxAppsGroupResults = 7;
-constexpr size_t kMaxOmniboxResults = 4;
 constexpr size_t kMaxLauncherSearchResults = 2;
 constexpr size_t kMaxZeroStateFileResults = 6;
 constexpr size_t kMaxDriveQuickAccessResults = 6;
@@ -91,7 +91,8 @@ std::unique_ptr<SearchController> CreateSearchController(
   size_t answer_card_group_id = controller->AddGroup(1, 1.0, 5.0);
   size_t apps_group_id =
       controller->AddGroup(kMaxAppsGroupResults, 1.0, kBoostOfApps);
-  size_t omnibox_group_id = controller->AddGroup(kMaxOmniboxResults, 1.0, 0.0);
+  size_t omnibox_group_id = controller->AddGroup(
+      AppListConfig::instance().max_search_result_list_items(), 1.0, 0.0);
 
   // Add search providers.
   controller->AddProvider(