diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 19:37:54 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 19:37:54 +0000 |
| commit | 4e8f0a76a825acd08f373b0492c90bdd6cc10f0b (patch) | |
| tree | 61fbad848b0c240ce749a48a3244da536397af89 /ipc/ipc_channel_proxy.cc | |
| parent | 6eed4094d08609af962197b99d2348d442d00d72 (diff) | |
| download | chromium_src-4e8f0a76a825acd08f373b0492c90bdd6cc10f0b.zip chromium_src-4e8f0a76a825acd08f373b0492c90bdd6cc10f0b.tar.gz chromium_src-4e8f0a76a825acd08f373b0492c90bdd6cc10f0b.tar.bz2 | |
PPAPI/NaCl: Re-land speculative implementation for ipc_channel_nacl.cc
Original CL: http://codereview.chromium.org/10174048/
Was committed at 139635, reverted at 139646 due to a flake.
BUG=116317
TEST=
TBR=dmichael@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10442112
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc/ipc_channel_proxy.cc')
| -rw-r--r-- | ipc/ipc_channel_proxy.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 3f0afa1..b9cc79c 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -367,7 +367,7 @@ void ChannelProxy::ClearIPCMessageLoop() { context()->ClearIPCMessageLoop(); } -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_NACL) // See the TODO regarding lazy initialization of the channel in // ChannelProxy::Init(). int ChannelProxy::GetClientFileDescriptor() { |