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

Unified Diff: content/plugin/plugin_channel.cc

Issue 1184523003: attachment broker wip (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor comments. 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/plugin/plugin_channel.h ('k') | content/plugin/plugin_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_channel.cc
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index 1f21c84d4bbbed77b7d8a0d9d243819b4772b5f4..c37eb0c2f6dfd3557619cd2ca7c1535e28fec4a2 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -140,19 +140,17 @@ class PluginChannel::MessageFilter : public IPC::MessageFilter {
};
PluginChannel* PluginChannel::GetPluginChannel(
- int renderer_id, base::SingleThreadTaskRunner* ipc_task_runner) {
+ int renderer_id,
+ base::SingleThreadTaskRunner* ipc_task_runner,
+ IPC::AttachmentBroker* broker) {
// Map renderer ID to a (single) channel to that process.
std::string channel_key = base::StringPrintf(
"%d.r%d", base::GetCurrentProcId(), renderer_id);
PluginChannel* channel =
static_cast<PluginChannel*>(NPChannelBase::GetChannel(
- channel_key,
- IPC::Channel::MODE_SERVER,
- ClassFactory,
- ipc_task_runner,
- false,
- ChildProcess::current()->GetShutDownEvent()));
+ channel_key, IPC::Channel::MODE_SERVER, ClassFactory, ipc_task_runner,
+ false, ChildProcess::current()->GetShutDownEvent(), broker));
if (channel)
channel->renderer_id_ = renderer_id;
@@ -228,9 +226,12 @@ void PluginChannel::CleanUp() {
bool PluginChannel::Init(base::SingleThreadTaskRunner* ipc_task_runner,
bool create_pipe_now,
- base::WaitableEvent* shutdown_event) {
- if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event))
+ base::WaitableEvent* shutdown_event,
+ IPC::AttachmentBroker* broker) {
+ if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event,
+ broker)) {
return false;
+ }
channel_->AddFilter(filter_.get());
return true;
« no previous file with comments | « content/plugin/plugin_channel.h ('k') | content/plugin/plugin_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698