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

Unified Diff: content/browser/renderer_host/render_process_host_impl.cc

Issue 599333002: ChannelMojo: Handle when ChannelMojo outlives ChannelMojoHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
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());

Powered by Google App Engine
This is Rietveld 408576698