chrome/browser/ui/ash/app_list/app_list_service_ash.cc - Issue 292443002: linux_aura: Compile ash into chrome.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src

Patch Set: Rebase to ToT Created 6 years, 7 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:

Index: chrome/browser/ui/ash/app_list/app_list_service_ash.cc

diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

index ac1dc4f52ef8537e202ac7ad40dfce5f1075c3cc..58eb99b5d10b8037589551f9d1f34ca2447f8040 100644

--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.cc

@@ -65,8 +65,9 @@ AppListControllerDelegate* AppListServiceAsh::GetControllerDelegate() {

return controller_delegate_.get();

}

-// Windows Ash additionally supports a native UI. See app_list_service_win.cc.

-#if !defined(OS_WIN)

+// Windows and Linux Ash additionally supports a native UI. See

+// app_list_service_{win,linux}.cc.

+#if defined(OS_CHROMEOS)

// static

AppListService* AppListService::Get(chrome::HostDesktopType desktop_type) {