Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(58)

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 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:
View side-by-side diff with in-line comments
Download patch
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..bfea962a0711d19c0dfff88f9b4cd3714aa7b6b2 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,12 @@ NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserView* browser_view) {
if (service_manager::ServiceManagerIsRemote())
return new BrowserFrameMus(browser_frame, browser_view);
+
rjkroege 2016/10/25 20:10:40 This should be unnecessary? You will have a servic
+#if defined(USE_OZONE)
+ NOTREACHED() << "For Ozone builds, --mash is being targeted, and "
+ << "the 'if' clause above would have taken place.";
+ return nullptr;
+#else
return new DesktopBrowserFrameAuraLinux(browser_frame, browser_view);
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698