Chromium Code Reviews| Index: components/nacl/renderer/embedder_service_channel.cc |
| diff --git a/components/nacl/renderer/trusted_plugin_channel.cc b/components/nacl/renderer/embedder_service_channel.cc |
| similarity index 68% |
| copy from components/nacl/renderer/trusted_plugin_channel.cc |
| copy to components/nacl/renderer/embedder_service_channel.cc |
| index 7ce3d843994745e3d65536b5988c43f040664a0b..f50bbaaabf4d464f2a5e70af277d0eb2ff4074f2 100644 |
| --- a/components/nacl/renderer/trusted_plugin_channel.cc |
| +++ b/components/nacl/renderer/embedder_service_channel.cc |
| @@ -2,8 +2,9 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "components/nacl/renderer/trusted_plugin_channel.h" |
| +#include "components/nacl/renderer/embedder_service_channel.h" |
| +#include "base/callback.h" |
| #include "base/callback_helpers.h" |
| #include "content/public/renderer/render_thread.h" |
| #include "ipc/ipc_channel.h" |
| @@ -12,36 +13,33 @@ |
| namespace nacl { |
| -TrustedPluginChannel::TrustedPluginChannel( |
| +EmbedderServiceChannel::EmbedderServiceChannel( |
| const IPC::ChannelHandle& handle, |
| const base::Callback<void(int32_t)>& connected_callback, |
| base::WaitableEvent* waitable_event) |
| : connected_callback_(connected_callback), |
| channel_(new IPC::SyncChannel( |
| handle, IPC::Channel::MODE_CLIENT, this, |
| - content::RenderThread::Get()->GetIOMessageLoopProxy(), true, |
| - waitable_event)) { |
| + content::RenderThread::Get()->GetIOMessageLoopProxy(), |
| + true, waitable_event)) { |
| } |
| -TrustedPluginChannel::~TrustedPluginChannel() { |
| +EmbedderServiceChannel::~EmbedderServiceChannel() { |
| if (!connected_callback_.is_null()) |
| base::ResetAndReturn(&connected_callback_).Run(PP_ERROR_FAILED); |
| } |
| -bool TrustedPluginChannel::Send(IPC::Message* message) { |
| - return channel_->Send(message); |
| -} |
| - |
| -bool TrustedPluginChannel::OnMessageReceived(const IPC::Message& message) { |
| +bool EmbedderServiceChannel::OnMessageReceived(const IPC::Message& message) { |
| + // TODO(hidehiko): Impelement StartCompleted and OpenResource. |
|
Mark Seaborn
2014/04/14 17:10:47
"Implement"
hidehiko
2014/04/16 18:15:46
Done.
|
| return false; |
| } |
| -void TrustedPluginChannel::OnChannelConnected(int32 peer_pid) { |
| +void EmbedderServiceChannel::OnChannelConnected(int32 peer_pid) { |
| if (!connected_callback_.is_null()) |
| base::ResetAndReturn(&connected_callback_).Run(PP_OK); |
| } |
| -void TrustedPluginChannel::OnChannelError() { |
| +void EmbedderServiceChannel::OnChannelError() { |
| if (!connected_callback_.is_null()) |
| base::ResetAndReturn(&connected_callback_).Run(PP_ERROR_FAILED); |
| } |