diff options
author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 11:57:36 +0000 |
---|---|---|
committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 11:57:36 +0000 |
commit | 4a9e852a691dbd67d8c178744e335a23330d253a (patch) | |
tree | b50155b7e89479c02f3e47fa16afc6d3b1cee85e /content/plugin/plugin_channel.cc | |
parent | b5be69a9c65e5a8e9c9912cb48336b069b67ed59 (diff) | |
download | chromium_src-4a9e852a691dbd67d8c178744e335a23330d253a.zip chromium_src-4a9e852a691dbd67d8c178744e335a23330d253a.tar.gz chromium_src-4a9e852a691dbd67d8c178744e335a23330d253a.tar.bz2 |
Add shutdown event argument to NPChannelBase::GetChannel()
Currently NPChannelBase uses ChildProcess::current()->GetShutDownEvent() as the
shutdown event for its underlying SyncChannel. This change allows child classes
to specify their own shutdown event.
This is required to allow NPChannelBase to be used between the renderer and
non-child processes.
This change is refactoring only and introduces no change in behaviour.
BUG=96703
Review URL: http://codereview.chromium.org/7971006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/plugin_channel.cc')
-rw-r--r-- | content/plugin/plugin_channel.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc index 6d428cf..a9a12a6 100644 --- a/content/plugin/plugin_channel.cc +++ b/content/plugin/plugin_channel.cc @@ -148,7 +148,8 @@ PluginChannel* PluginChannel::GetPluginChannel( IPC::Channel::MODE_SERVER, ClassFactory, ipc_message_loop, - false)); + false, + ChildProcess::current()->GetShutDownEvent())); if (channel) channel->renderer_id_ = renderer_id; @@ -324,8 +325,9 @@ void PluginChannel::CleanUp() { } bool PluginChannel::Init(base::MessageLoopProxy* ipc_message_loop, - bool create_pipe_now) { - if (!NPChannelBase::Init(ipc_message_loop, create_pipe_now)) + bool create_pipe_now, + base::WaitableEvent* shutdown_event) { + if (!NPChannelBase::Init(ipc_message_loop, create_pipe_now, shutdown_event)) return false; channel_->AddFilter(filter_.get()); |