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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_thread_impl.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/public/common/url_constants.cc ('k') | content/renderer/render_widget.cc » ('j') | mojo/shell/application_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 45c7e3d9a8d8e5e6289bd159cde672878cb291ea..f90f7cfc97c719c66f32799adbd320fb454fe7d8 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -860,7 +860,9 @@ void RenderThreadImpl::Init() {
#if defined(MOJO_SHELL_CLIENT)
// We may not have a MojoShellConnection object in tests that directly
// instantiate a RenderThreadImpl.
- if (MojoShellConnection::Get())
+ if (MojoShellConnection::Get() &&
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kUseMusInRenderer))
CreateRenderWidgetWindowTreeClientFactory();
#endif
}
« no previous file with comments | « content/public/common/url_constants.cc ('k') | content/renderer/render_widget.cc » ('j') | mojo/shell/application_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698