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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
 
 #include "chrome/browser/ui/views/frame/browser_frame_mus.h"
 #include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h"
 #include "services/shell/runner/common/client_util.h"
 
 NativeBrowserFrame* NativeBrowserFrameFactory::Create(
     BrowserFrame* browser_frame,
     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.

 }