Index: chrome/browser/ui/app_list/search/search_controller_factory.cc |
diff --git a/chrome/browser/ui/app_list/search/search_controller_factory.cc b/chrome/browser/ui/app_list/search/search_controller_factory.cc |
index 3776d4695f0b89150d19b8317ad22eb9cccb80b1..bbe518c27b936533b5c40058da7ddc0e79db0f73 100644 |
--- a/chrome/browser/ui/app_list/search/search_controller_factory.cc |
+++ b/chrome/browser/ui/app_list/search/search_controller_factory.cc |
@@ -34,7 +34,6 @@ namespace { |
// Maximum number of results to show in each mixer group. |
const size_t kMaxAppsGroupResults = 4; |
-// Ignored unless AppListMixer field trial is "Blended". |
const size_t kMaxOmniboxResults = 4; |
const size_t kMaxWebstoreResults = 2; |
const size_t kMaxSuggestionsResults = 6; |
@@ -67,18 +66,12 @@ std::unique_ptr<SearchController> CreateSearchController( |
HistoryFactory::GetForBrowserContext(profile))); |
// Add mixer groups. There are three main groups: apps, webstore and |
- // omnibox. The behaviour depends on the AppListMixer field trial: |
- // - If default: The apps and webstore groups each have a fixed |
- // maximum number of results. The omnibox group fills the remaining slots |
- // (with a minimum of one result). |
- // - If "Blended": Each group has a "soft" maximum number of results. However, |
- // if a query turns up very few results, the mixer may take more than this |
- // maximum from a particular group. |
- size_t apps_group_id = controller->AddGroup(kMaxAppsGroupResults, 3.0, 1.0); |
- size_t omnibox_group_id = |
- controller->AddOmniboxGroup(kMaxOmniboxResults, 2.0, 1.0); |
- size_t webstore_group_id = |
- controller->AddGroup(kMaxWebstoreResults, 1.0, 0.4); |
+ // omnibox. Each group has a "soft" maximum number of results. However, if |
+ // a query turns up very few results, the mixer may take more than this |
+ // maximum from a particular group. |
+ size_t apps_group_id = controller->AddGroup(kMaxAppsGroupResults, 1.0); |
+ size_t omnibox_group_id = controller->AddGroup(kMaxOmniboxResults, 1.0); |
+ size_t webstore_group_id = controller->AddGroup(kMaxWebstoreResults, 0.4); |
// Add search providers. |
controller->AddProvider( |
@@ -94,7 +87,7 @@ std::unique_ptr<SearchController> CreateSearchController( |
new WebstoreProvider(profile, list_controller))); |
if (IsSuggestionsSearchProviderEnabled()) { |
size_t suggestions_group_id = |
- controller->AddGroup(kMaxSuggestionsResults, 3.0, 1.0); |
+ controller->AddGroup(kMaxSuggestionsResults, 1.0); |
controller->AddProvider( |
suggestions_group_id, |
std::unique_ptr<SearchProvider>( |
@@ -107,7 +100,7 @@ std::unique_ptr<SearchController> CreateSearchController( |
if (app_list::switches::IsDriveSearchInChromeLauncherEnabled() && |
!profile->IsGuestSession()) { |
size_t search_api_group_id = |
- controller->AddGroup(kMaxLauncherSearchResults, 0.0, 1.0); |
+ controller->AddGroup(kMaxLauncherSearchResults, 1.0); |
controller->AddProvider( |
search_api_group_id, |
std::unique_ptr<SearchProvider>(new LauncherSearchProvider(profile))); |