Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(855)

Unified Diff: chrome/browser/ui/app_list/search/search_controller_factory.cc

Issue 2787693002: Remove more dead app list code. (Closed)
Patch Set: updated comment Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3506a1f9b3000ccf2e9a024731bcf206d1cf89b0..513a9899ba4ef822040ef8f2038739ca5f673291 100644
--- a/chrome/browser/ui/app_list/search/search_controller_factory.cc
+++ b/chrome/browser/ui/app_list/search/search_controller_factory.cc
@@ -23,10 +23,7 @@
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/search/mixer.h"
#include "ui/app_list/search_controller.h"
-
-#if defined(OS_CHROMEOS)
#include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h"
-#endif
namespace app_list {
@@ -37,10 +34,7 @@ constexpr size_t kMaxAppsGroupResults = 8;
constexpr size_t kMaxOmniboxResults = 4;
constexpr size_t kMaxWebstoreResults = 2;
constexpr size_t kMaxSuggestionsResults = 6;
-
-#if defined(OS_CHROMEOS)
constexpr size_t kMaxLauncherSearchResults = 2;
-#endif
// Constants related to the SuggestionsService in AppList field trial.
constexpr char kSuggestionsProviderFieldTrialName[] =
@@ -97,7 +91,6 @@ std::unique_ptr<SearchController> CreateSearchController(
// LauncherSearchProvider is added only when flag is enabled, not in guest
// session and running on Chrome OS.
-#if defined(OS_CHROMEOS)
if (app_list::switches::IsDriveSearchInChromeLauncherEnabled() &&
!profile->IsGuestSession()) {
size_t search_api_group_id =
@@ -105,7 +98,6 @@ std::unique_ptr<SearchController> CreateSearchController(
controller->AddProvider(search_api_group_id,
base::MakeUnique<LauncherSearchProvider>(profile));
}
-#endif
return controller;
}
« no previous file with comments | « chrome/browser/ui/app_list/search/extension_app_result.cc ('k') | chrome/browser/ui/app_list/start_page_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698