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

Unified Diff: components/nacl/renderer/trusted_plugin_channel.cc

Issue 486383002: Pepper: Make trusted plugin channel sync again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 4 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 | « components/nacl/renderer/trusted_plugin_channel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/trusted_plugin_channel.cc
diff --git a/components/nacl/renderer/trusted_plugin_channel.cc b/components/nacl/renderer/trusted_plugin_channel.cc
index 30be80c89b91368db0dc5be8dfe3710c1094d49e..29e8aff20a0d74f2c0d56bbfb64ea2752386b1cd 100644
--- a/components/nacl/renderer/trusted_plugin_channel.cc
+++ b/components/nacl/renderer/trusted_plugin_channel.cc
@@ -6,25 +6,28 @@
#include "base/callback_helpers.h"
#include "content/public/renderer/render_thread.h"
-#include "ipc/ipc_channel_proxy.h"
+#include "ipc/ipc_sync_channel.h"
#include "ppapi/c/pp_errors.h"
namespace nacl {
TrustedPluginChannel::TrustedPluginChannel(
- const IPC::ChannelHandle& handle) {
- channel_proxy_ = IPC::ChannelProxy::Create(
+ const IPC::ChannelHandle& handle,
+ base::WaitableEvent* shutdown_event) {
+ channel_ = IPC::SyncChannel::Create(
handle,
IPC::Channel::MODE_CLIENT,
this,
- content::RenderThread::Get()->GetIOMessageLoopProxy()).Pass();
+ content::RenderThread::Get()->GetIOMessageLoopProxy(),
+ true,
+ shutdown_event).Pass();
}
TrustedPluginChannel::~TrustedPluginChannel() {
}
bool TrustedPluginChannel::Send(IPC::Message* message) {
- return channel_proxy_->Send(message);
+ return channel_->Send(message);
}
bool TrustedPluginChannel::OnMessageReceived(const IPC::Message& message) {
« no previous file with comments | « components/nacl/renderer/trusted_plugin_channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698