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

Unified Diff: chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc

Issue 211133005: [WIP] Not for review. Zero copy. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 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/views/app_list/linux/app_list_service_linux.cc
diff --git a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
index 519bc314d3630cd262980f599637bd9e9f9c61a4..a51923e982ebb459083e40bdb0c1e2b3a5ded05c 100644
--- a/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
+++ b/chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc
@@ -84,14 +84,18 @@ void AppListServiceLinux::MoveNearCursor(app_list::AppListView* view) {
// static
AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {
+#if defined(USE_ASH)
if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
return AppListServiceAsh::GetInstance();
+#endif
return AppListServiceLinux::GetInstance();
}
// static
void AppListService::InitAll(Profile* initial_profile) {
+#if defined(USE_ASH)
AppListServiceAsh::GetInstance()->Init(initial_profile);
+#endif
AppListServiceLinux::GetInstance()->Init(initial_profile);
}

Powered by Google App Engine
This is Rietveld 408576698