Chromium Code Reviews| Index: content/renderer/render_thread_impl.cc |
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc |
| index 62c05a05d288b9e7d7f07e8964a7207f2559770b..220a3f0eeaa8c524e5cb6ed517c4a971d72d3ab1 100644 |
| --- a/content/renderer/render_thread_impl.cc |
| +++ b/content/renderer/render_thread_impl.cc |
| @@ -291,6 +291,11 @@ void CreateRenderFrameSetup(mojo::InterfaceRequest<RenderFrameSetup> request) { |
| mojo::BindToRequest(new RenderFrameSetupImpl(), &request); |
| } |
| +bool IsMojoChannelEnabled() { |
|
darin (slow to review)
2014/07/23 23:03:33
nit: ShouldUseMojoChannel
Hajime Morrita
2014/07/24 00:38:44
Done.
|
| + return CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kEnableRendererMojoChannel); |
| +} |
| + |
| } // namespace |
| // For measuring memory usage after each task. Behind a command line flag. |
| @@ -359,12 +364,13 @@ RenderThreadImpl* RenderThreadImpl::current() { |
| // When we run plugins in process, we actually run them on the render thread, |
| // which means that we need to make the render thread pump UI events. |
| -RenderThreadImpl::RenderThreadImpl() { |
| +RenderThreadImpl::RenderThreadImpl() |
| + : ChildThread(InitOptions("", IsMojoChannelEnabled())) { |
| Init(); |
| } |
| RenderThreadImpl::RenderThreadImpl(const std::string& channel_name) |
| - : ChildThread(channel_name) { |
| + : ChildThread(InitOptions(channel_name, IsMojoChannelEnabled())) { |
| Init(); |
| } |