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

Unified Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc

Issue 1416373010: Implement a MusBrowserFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome
Patch Set: . Created 5 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
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 2fc944119c4d14427c650083d0249fca7219277f..339fb3ae2a57618918047b252c44a35edf24f99c 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
@@ -4,12 +4,22 @@
#include "chrome/browser/ui/views/frame/native_browser_frame_factory.h"
+#include "chrome/browser/mojo_runner_util.h"
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h"
+#if defined(MOJO_RUNNER_CLIENT)
+#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
+#endif
+
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,
BrowserView* browser_view) {
+#if defined(MOJO_RUNNER_CLIENT)
+ if (IsRunningInMojoRunner())
+ return new BrowserFrameMus(browser_frame, browser_view);
+#endif
+
if (ShouldCreateForAshDesktop(browser_view))
return new BrowserFrameAsh(browser_frame, browser_view);
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.cc ('k') | chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698