Chromium Code Reviews| Index: content/browser/renderer_host/render_process_host_impl.cc |
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
| index 4eaf0508a18fe3ffc8fb24f788a0bc909d7254a3..cce4a1d1fc26c90cc2959e89871af4bc1c0fd122 100644 |
| --- a/content/browser/renderer_host/render_process_host_impl.cc |
| +++ b/content/browser/renderer_host/render_process_host_impl.cc |
| @@ -137,7 +137,6 @@ |
| #include "ipc/ipc_logging.h" |
| #include "ipc/ipc_switches.h" |
| #include "ipc/mojo/ipc_channel_mojo.h" |
| -#include "ipc/mojo/ipc_channel_mojo_host.h" |
| #include "media/base/media_switches.h" |
| #include "net/url_request/url_request_context_getter.h" |
| #include "ppapi/shared_impl/ppapi_switches.h" |
| @@ -2107,8 +2106,12 @@ void RenderProcessHostImpl::OnProcessLaunched() { |
| // Chrome IPC message. |
| MaybeActivateMojo(); |
| - if (channel_mojo_host_) |
| - channel_mojo_host_->OnClientLaunched(child_process_launcher_->GetHandle()); |
| + if (channel_mojo_host_) { |
| + base::ProcessHandle process = child_process_launcher_ |
|
viettrungluu
2014/09/25 19:38:34
When can child_process_launcher_ be null? Maybe yo
Hajime Morrita
2014/09/25 22:00:03
Done.
|
| + ? child_process_launcher_->GetHandle() |
| + : base::GetCurrentProcessHandle(); |
| + channel_mojo_host_->OnClientLaunched(process); |
| + } |
| while (!queued_messages_.empty()) { |
| Send(queued_messages_.front()); |