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

Side by Side Diff: trunk/src/ppapi/proxy/proxy_channel.cc

Issue 312553004: Revert 274310 "Introduce IPC::ChannelProxy::Create*() and IPC::S..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ppapi/proxy/proxy_channel.h" 5 #include "ppapi/proxy/proxy_channel.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ipc/ipc_platform_file.h" 8 #include "ipc/ipc_platform_file.h"
9 #include "ipc/ipc_test_sink.h" 9 #include "ipc/ipc_test_sink.h"
10 10
(...skipping 13 matching lines...) Expand all
24 ProxyChannel::~ProxyChannel() { 24 ProxyChannel::~ProxyChannel() {
25 DVLOG(1) << "ProxyChannel::~ProxyChannel()"; 25 DVLOG(1) << "ProxyChannel::~ProxyChannel()";
26 } 26 }
27 27
28 bool ProxyChannel::InitWithChannel(Delegate* delegate, 28 bool ProxyChannel::InitWithChannel(Delegate* delegate,
29 base::ProcessId peer_pid, 29 base::ProcessId peer_pid,
30 const IPC::ChannelHandle& channel_handle, 30 const IPC::ChannelHandle& channel_handle,
31 bool is_client) { 31 bool is_client) {
32 delegate_ = delegate; 32 delegate_ = delegate;
33 peer_pid_ = peer_pid; 33 peer_pid_ = peer_pid;
34 channel_ = IPC::SyncChannel::Create( 34 IPC::Channel::Mode mode = is_client ? IPC::Channel::MODE_CLIENT
35 this, 35 : IPC::Channel::MODE_SERVER;
36 delegate->GetIPCMessageLoop(), 36 channel_.reset(new IPC::SyncChannel(channel_handle, mode, this,
37 delegate->GetShutdownEvent()); 37 delegate->GetIPCMessageLoop(), true,
38 if (is_client) 38 delegate->GetShutdownEvent()));
39 channel_->InitClient(channel_handle, true);
40 else
41 channel_->InitServer(channel_handle, true);
42 return true; 39 return true;
43 } 40 }
44 41
45 void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) { 42 void ProxyChannel::InitWithTestSink(IPC::TestSink* test_sink) {
46 DCHECK(!test_sink_); 43 DCHECK(!test_sink_);
47 test_sink_ = test_sink; 44 test_sink_ = test_sink;
48 #if !defined(OS_NACL) 45 #if !defined(OS_NACL)
49 peer_pid_ = base::GetCurrentProcId(); 46 peer_pid_ = base::GetCurrentProcId();
50 #endif 47 #endif
51 } 48 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 if (channel_.get()) 83 if (channel_.get())
87 return channel_->Send(msg); 84 return channel_->Send(msg);
88 85
89 // Remote side crashed, drop this message. 86 // Remote side crashed, drop this message.
90 delete msg; 87 delete msg;
91 return false; 88 return false;
92 } 89 }
93 90
94 } // namespace proxy 91 } // namespace proxy
95 } // namespace ppapi 92 } // namespace ppapi
OLDNEW
« no previous file with comments | « trunk/src/ppapi/nacl_irt/ppapi_dispatcher.cc ('k') | trunk/src/remoting/host/desktop_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698