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

Unified Diff: chrome/browser/ui/app_list/search/app_search_provider.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/app_search_provider.cc
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc
index 6e8066094315a62df81d79a3496a8c5772cab74b..b524c1d9e52015070a8e618a1128daa7bf0879e9 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider.cc
@@ -31,13 +31,10 @@
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/search/tokenized_string.h"
#include "ui/app_list/search/tokenized_string_match.h"
-
-#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
#include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
#include "chrome/browser/ui/app_list/search/arc_app_result.h"
-#endif
using extensions::ExtensionRegistry;
@@ -193,7 +190,6 @@ class ExtensionDataSource : public AppSearchProvider::DataSource,
DISALLOW_COPY_AND_ASSIGN(ExtensionDataSource);
};
-#if defined(OS_CHROMEOS)
class ArcDataSource : public AppSearchProvider::DataSource,
public ArcAppListPrefs::Observer {
public:
@@ -256,7 +252,6 @@ class ArcDataSource : public AppSearchProvider::DataSource,
private:
DISALLOW_COPY_AND_ASSIGN(ArcDataSource);
};
-#endif
} // namespace
@@ -270,10 +265,8 @@ AppSearchProvider::AppSearchProvider(Profile* profile,
update_results_factory_(this) {
data_sources_.emplace_back(
base::MakeUnique<ExtensionDataSource>(profile, this));
-#if defined(OS_CHROMEOS)
if (arc::IsArcAllowedForProfile(profile))
data_sources_.emplace_back(base::MakeUnique<ArcDataSource>(profile, this));
-#endif
}
AppSearchProvider::~AppSearchProvider() {}

Powered by Google App Engine
This is Rietveld 408576698