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

Unified Diff: content/plugin/plugin_channel.cc

Issue 1292263003: ipc: Use a global for the process's attachment broker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ipc_message2
Patch Set: Comments from avi. Created 5 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
« 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 c37eb0c2f6dfd3557619cd2ca7c1535e28fec4a2..90993e94725748a27a0ccaac1ac000cd6bedb6aa 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -141,8 +141,7 @@ class PluginChannel::MessageFilter : public IPC::MessageFilter {
PluginChannel* PluginChannel::GetPluginChannel(
int renderer_id,
- base::SingleThreadTaskRunner* ipc_task_runner,
- IPC::AttachmentBroker* broker) {
+ base::SingleThreadTaskRunner* ipc_task_runner) {
// Map renderer ID to a (single) channel to that process.
std::string channel_key = base::StringPrintf(
"%d.r%d", base::GetCurrentProcId(), renderer_id);
@@ -150,7 +149,7 @@ PluginChannel* PluginChannel::GetPluginChannel(
PluginChannel* channel =
static_cast<PluginChannel*>(NPChannelBase::GetChannel(
channel_key, IPC::Channel::MODE_SERVER, ClassFactory, ipc_task_runner,
- false, ChildProcess::current()->GetShutDownEvent(), broker));
+ false, ChildProcess::current()->GetShutDownEvent()));
if (channel)
channel->renderer_id_ = renderer_id;
@@ -226,12 +225,9 @@ void PluginChannel::CleanUp() {
bool PluginChannel::Init(base::SingleThreadTaskRunner* ipc_task_runner,
bool create_pipe_now,
- base::WaitableEvent* shutdown_event,
- IPC::AttachmentBroker* broker) {
- if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event,
- broker)) {
+ base::WaitableEvent* shutdown_event) {
+ if (!NPChannelBase::Init(ipc_task_runner, create_pipe_now, shutdown_event))
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