ipc/ipc_channel_proxy.h - Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ipc/ipc_channel_proxy.h

Issue 664373003: Introduce OS_NACL_SFI and OS_NACL_NONSFI macros. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

Index: ipc/ipc_channel_proxy.h

diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h

index e2ad4a9495c1c0b4de821008c0b592f48025ebe7..dda5fa5f41cbc064cc4e14600fc5693962b98df8 100644

--- a/ipc/ipc_channel_proxy.h

+++ b/ipc/ipc_channel_proxy.h

@@ -119,8 +119,7 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe {

// Returns base::kNullProcessId if the peer is not connected yet.

base::ProcessId GetPeerPID() const { return context_->peer_pid_; }

-#if defined(OS_POSIX) && \

- (!defined(OS_NACL) || defined(__native_client_nonsfi__))

+#if defined(OS_POSIX) && !defined(OS_NACL_SFI)

// Calls through to the underlying channel's methods.

int GetClientFileDescriptor();

base::ScopedFD TakeClientFileDescriptor();

« no previous file with comments | « ipc/ipc_channel.h ('k') | ipc/ipc_channel_proxy.cc » ('j') | no next file with comments »