summaryrefslogtreecommitdiffstats
path: root/ipc/ipc_channel_proxy.h
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 22:02:24 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 22:02:24 +0000
commit800c8d730fc85e7bf9b548947f5842828346c485 (patch)
tree3522f743ae1e8d474278af6ca28e4a0183de4175 /ipc/ipc_channel_proxy.h
parent6c64593b006e833c6712c534acccbb2b79126135 (diff)
downloadchromium_src-800c8d730fc85e7bf9b548947f5842828346c485.zip
chromium_src-800c8d730fc85e7bf9b548947f5842828346c485.tar.gz
chromium_src-800c8d730fc85e7bf9b548947f5842828346c485.tar.bz2
Revert 139635 - PPAPI/NaCl: Speculative implementation for ipc_channel_nacl.cc
BUG=116317 TEST= Review URL: https://chromiumcodereview.appspot.com/10174048 TBR=dmichael@chromium.org Review URL: https://chromiumcodereview.appspot.com/10456039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139646 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_proxy.h')
-rw-r--r--ipc/ipc_channel_proxy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 6f5b96f..8c0031a 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -179,7 +179,7 @@ class IPC_EXPORT ChannelProxy : public Message::Sender {
// Returns base::kNullProcessId if the peer is not connected yet.
base::ProcessId peer_pid() const { return context_->peer_pid_; }
-#if defined(OS_POSIX) && !defined(OS_NACL)
+#if defined(OS_POSIX)
// Calls through to the underlying channel's methods.
int GetClientFileDescriptor();
int TakeClientFileDescriptor();