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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/browser_main_loop.cc

Issue 1738663002: Hook embedded shell up to MojoShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | mojo/shell/application_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 8f6909b77627650af6b10479f3072ec5c2eb11fb..a184440ccc115f4c53ab16bbd785b805da279b7e 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -915,16 +915,14 @@ int BrowserMainLoop::CreateThreads() {
}
int BrowserMainLoop::PreMainMessageLoopRun() {
-#if defined(MOJO_SHELL_CLIENT)
if (IsRunningInMojoShell()) {
MojoShellConnectionImpl::Create();
MojoShellConnectionImpl::Get()->BindToCommandLinePlatformChannel();
-#if defined(USE_AURA)
+#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)
views::WindowManagerConnection::Create(
MojoShellConnection::Get()->GetShell());
#endif
}
-#endif
if (parts_) {
TRACE_EVENT0("startup",
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/mojo/mojo_shell_context.cc » ('j') | mojo/shell/application_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698