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

Unified Diff: ipc/ipc_channel_proxy.cc

Issue 659243002: Non-SFI Mode: Build ipc/ library by PNaCl toolchain for nacl_helper_nonsfi. (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:
View side-by-side diff with in-line comments
Download patch
Index: ipc/ipc_channel_proxy.cc
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index f74dc83a4133b926c4aa67ddd04d1442dd2db6da..e9ebbf58cc0f6667c4a3caa34f609e1cddfea8d4 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -434,7 +434,8 @@ void ChannelProxy::ClearIPCTaskRunner() {
context()->ClearIPCTaskRunner();
}
-#if defined(OS_POSIX) && !defined(OS_NACL)
+#if defined(OS_POSIX) && \
+ (!defined(OS_NACL) || defined(__native_client_nonsfi__))
// See the TODO regarding lazy initialization of the channel in
// ChannelProxy::Init().
int ChannelProxy::GetClientFileDescriptor() {
« ipc/ipc_channel_posix.cc ('K') | « ipc/ipc_channel_proxy.h ('k') | ipc/ipc_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698