Make it possible to launch chrome --mash with ozone_platform={wayland|x11}, chromeos=0

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

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 7515c037292a73af9769b0c19ce9dc311ceb9b20..6801f1cf2373e2f49034d80dcb3d1285e1c6f07b 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,9 @@ NativeBrowserFrame* NativeBrowserFrameFactory::Create(
     BrowserView* browser_view) {
   if (shell::ShellIsRemote())
     return new BrowserFrameMus(browser_frame, browser_view);
+
+#if !defined(USE_OZONE)
   return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view);
+#endif
+  return nullptr;

[fwang, 2016/10/11 09:34:12]

I think this should be

#if !defined(USE_OZONE)
   return new DesktopBrowserFrameAuraLinux(browser_frame,...
#else
   return nullptr;
#endif

to avoid duplicate returns when !USE_OZONE

[tonikitoo, 2016/10/11 12:59:03]

Done.

 }