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

Unified Diff: content/common/child_process_sandbox_support_impl_linux.cc

Issue 687363004: Introduce content_nacl_nonsfi.gyp 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
« no previous file with comments | « components/nacl_nonsfi.gyp ('k') | content/content_nacl_nonsfi.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/child_process_sandbox_support_impl_linux.cc
diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc
index 5cc8144e5ec68db2d117659abdffd486a5644b75..c1be553650f94a8ea5ea5577f2ddd78b8714e495 100644
--- a/content/common/child_process_sandbox_support_impl_linux.cc
+++ b/content/common/child_process_sandbox_support_impl_linux.cc
@@ -8,21 +8,25 @@
#include <limits>
+#include "base/posix/unix_domain_socket_linux.h"
+#include "content/common/zygote_commands_linux.h"
+
+#if !defined(OS_NACL_NONSFI)
#include "base/basictypes.h"
#include "base/debug/trace_event.h"
#include "base/memory/scoped_ptr.h"
#include "base/numerics/safe_conversions.h"
#include "base/pickle.h"
#include "base/posix/eintr_wrapper.h"
-#include "base/posix/unix_domain_socket_linux.h"
#include "base/sys_byteorder.h"
#include "content/common/sandbox_linux/sandbox_linux.h"
-#include "content/common/zygote_commands_linux.h"
#include "third_party/WebKit/public/platform/linux/WebFallbackFont.h"
#include "third_party/WebKit/public/platform/linux/WebFontRenderStyle.h"
+#endif // !defined(OS_NACL_NONSFI)
namespace content {
+#if !defined(OS_NACL_NONSFI)
void GetFallbackFontForCharacter(int32_t character,
const char* preferred_locale,
blink::WebFallbackFont* fallbackFont) {
@@ -204,6 +208,7 @@ bool GetFontTable(int fd, uint32_t table_tag, off_t offset,
return true;
}
+#endif // !defined(OS_NACL_NONSFI)
bool SendZygoteChildPing(int fd) {
jam 2014/10/30 22:45:48 why not move this to a separate file?
hidehiko 2014/10/31 07:03:39 Done.
return UnixDomainSocket::SendMsg(fd,
« no previous file with comments | « components/nacl_nonsfi.gyp ('k') | content/content_nacl_nonsfi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698