chrome/browser/ui/startup/startup_browser_creator.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/startup/startup_browser_creator.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/startup/startup_browser_creator.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc

index 3b655839e32c25b6e99757380f4e9cd8fb6ebdc5..122e0a4d2c6a4ff9f85870ed0c7146c9c507740a 100644

--- a/chrome/browser/ui/startup/startup_browser_creator.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator.cc

@@ -299,7 +299,7 @@ bool StartupBrowserCreator::LaunchBrowser(

chrome::HostDesktopType host_desktop_type =

chrome::HOST_DESKTOP_TYPE_NATIVE;

-#if defined(OS_WIN) && defined(USE_ASH)

+#if defined(USE_ASH) && !defined(OS_CHROMEOS)

// We want to maintain only one type of instance for now, either ASH

// or desktop.

// TODO(shrikant): Remove this code once we decide on running both desktop