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

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

Issue 1187153003: Update content module for IPC attachment brokering. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GPUChannelHostFactory also needs to virtually inherit from SupportsAttachmentBrokering. This patch … Created 5 years, 6 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/plugin_data_remover_impl.cc ('k') | content/child/child_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f1466fa4154991ce38f4f98582e37be6aa752d80..aa2cee48283064b71af03a4164ff996547891149 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -137,6 +137,7 @@
#include "content/public/browser/resource_context.h"
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/worker_service.h"
+#include "content/public/common/child_process_host.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/mojo_channel_switches.h"
@@ -717,14 +718,16 @@ scoped_ptr<IPC::ChannelProxy> RenderProcessHostImpl::CreateChannelProxy(
channel_mojo_host_.reset(new IPC::ChannelMojoHost(mojo_task_runner));
}
- return IPC::ChannelProxy::Create(IPC::ChannelMojo::CreateServerFactory(
- channel_mojo_host_->channel_delegate(),
- mojo_task_runner, channel_id),
- this, runner.get());
+ return IPC::ChannelProxy::Create(
+ IPC::ChannelMojo::CreateServerFactory(
+ channel_mojo_host_->channel_delegate(), mojo_task_runner,
+ channel_id, content::ChildProcessHost::GetAttachmentBroker()),
+ this, runner.get());
}
return IPC::ChannelProxy::Create(
- channel_id, IPC::Channel::MODE_SERVER, this, runner.get());
+ channel_id, IPC::Channel::MODE_SERVER, this, runner.get(),
+ content::ChildProcessHost::GetAttachmentBroker());
}
void RenderProcessHostImpl::CreateMessageFilters() {
« no previous file with comments | « content/browser/plugin_data_remover_impl.cc ('k') | content/child/child_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698