chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.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/ui/views/frame/native_browser_frame_factory_auralinux.cc

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

Patch Set: addressed sky's review Created 4 years, 1 month 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

« no previous file with comments | « chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

index 44dd8b526135f2acfec2a73a12a5f5b5ba12c136..329a4df2fe6852641d0374caa52feb4eadc0e921 100644

--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

@@ -13,5 +13,10 @@ NativeBrowserFrame* NativeBrowserFrameFactory::Create(

BrowserView* browser_view) {

if (service_manager::ServiceManagerIsRemote())

return new BrowserFrameMus(browser_frame, browser_view);

+#if defined(USE_OZONE)

sky 2016/11/07 17:18:52 You shouldn't need this ifdef anymore, right?

tonikitoo 2016/11/07 17:22:18 Sorry, forgot to git add the change locally. It is

+ NOTREACHED() << "For Ozone builds, only --mash launch is supported for now.";

+ return nullptr;

+#else

return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view);

+#endif

}