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: ipc/ipc_channel_nacl.cc

Issue 601563002: Remove IPC::Channel::TakePipeHandle() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Nacl build error Created 6 years, 2 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
« no previous file with comments | « ipc/ipc_channel_nacl.h ('k') | ipc/ipc_channel_posix.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ipc/ipc_channel_nacl.h" 5 #include "ipc/ipc_channel_nacl.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <sys/types.h> 9 #include <sys/types.h>
10 10
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 base::ProcessId ChannelNacl::GetPeerPID() const { 142 base::ProcessId ChannelNacl::GetPeerPID() const {
143 // This shouldn't actually get used in the untrusted side of the proxy, and we 143 // This shouldn't actually get used in the untrusted side of the proxy, and we
144 // don't have the real pid anyway. 144 // don't have the real pid anyway.
145 return -1; 145 return -1;
146 } 146 }
147 147
148 base::ProcessId ChannelNacl::GetSelfPID() const { 148 base::ProcessId ChannelNacl::GetSelfPID() const {
149 return -1; 149 return -1;
150 } 150 }
151 151
152 ChannelHandle ChannelNacl::TakePipeHandle() {
153 // NACL doesn't have any platform-level handles.
154 return ChannelHandle();
155 }
156
157 bool ChannelNacl::Connect() { 152 bool ChannelNacl::Connect() {
158 if (pipe_ == -1) { 153 if (pipe_ == -1) {
159 DLOG(WARNING) << "Channel creation failed: " << pipe_name_; 154 DLOG(WARNING) << "Channel creation failed: " << pipe_name_;
160 return false; 155 return false;
161 } 156 }
162 157
163 // Note that Connect is called on the "Channel" thread (i.e., the same thread 158 // Note that Connect is called on the "Channel" thread (i.e., the same thread
164 // where Channel::Send will be called, and the same thread that should receive 159 // where Channel::Send will be called, and the same thread that should receive
165 // messages). The constructor might be invoked on another thread (see 160 // messages). The constructor might be invoked on another thread (see
166 // ChannelProxy for an example of that). Therefore, we must wait until Connect 161 // ChannelProxy for an example of that). Therefore, we must wait until Connect
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 // Channel's methods 372 // Channel's methods
378 373
379 // static 374 // static
380 scoped_ptr<Channel> Channel::Create( 375 scoped_ptr<Channel> Channel::Create(
381 const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener) { 376 const IPC::ChannelHandle &channel_handle, Mode mode, Listener* listener) {
382 return scoped_ptr<Channel>( 377 return scoped_ptr<Channel>(
383 new ChannelNacl(channel_handle, mode, listener)); 378 new ChannelNacl(channel_handle, mode, listener));
384 } 379 }
385 380
386 } // namespace IPC 381 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/ipc_channel_nacl.h ('k') | ipc/ipc_channel_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698