chrome/browser/chrome_content_browser_client.cc - Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0

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/chrome_content_browser_client.cc

Issue 2408803002: Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0 (Closed)

Patch Set: addressed tom's reviews Created 4 years, 2 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/chrome_content_browser_client.cc

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc

index 449912a486f24c55f874b5bf49186259a6301e81..eb57bc013cb58ac039a79f9a098e4135ae8c8171 100644

--- a/chrome/browser/chrome_content_browser_client.cc

+++ b/chrome/browser/chrome_content_browser_client.cc

@@ -892,7 +892,7 @@ content::BrowserMainParts* ChromeContentBrowserClient::CreateBrowserMainParts(

// Construct additional browser parts. Stages are called in the order in

// which they are added.

#if defined(TOOLKIT_VIEWS)

-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)

main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());

#else

main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());