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

Unified Diff: chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.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_chromeos.cc
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
index 3a30309c47f734f6e591bfbf21818b616d851d56..1f42d7edc2707fbeb5a6b308436a501da43736dc 100644
--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
@@ -4,10 +4,19 @@
#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"
+#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
return new BrowserFrameAsh(browser_frame, browser_view);
}
« no previous file with comments | « chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698