Commit 78429ab2 authored by Avi Drissman's avatar Avi Drissman Committed by Commit Bot

Further cleanup of OS_MACOSX in extensions

Bug: 1105907
Change-Id: I9ef37d35c24a3d1babd1549fb67127a0c3ab3341
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2328337
Auto-Submit: Avi Drissman <avi@chromium.org>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: default avatarReilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793205}
parent 2ac472cf
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#endif // OS_LINUX #endif // OS_LINUX
#if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID) #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_ANDROID)
#include "components/nacl/zygote/nacl_fork_delegate_linux.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID #endif // OS_POSIX && !OS_MAC && !OS_ANDROID
#endif // BUILDFLAG(ENABLE_NACL) #endif // BUILDFLAG(ENABLE_NACL)
#if defined(OS_WIN) #if defined(OS_WIN)
...@@ -189,7 +189,7 @@ void ShellMainDelegate::ZygoteStarting( ...@@ -189,7 +189,7 @@ void ShellMainDelegate::ZygoteStarting(
nacl::AddNaClZygoteForkDelegates(delegates); nacl::AddNaClZygoteForkDelegates(delegates);
#endif // BUILDFLAG(ENABLE_NACL) #endif // BUILDFLAG(ENABLE_NACL)
} }
#endif // OS_POSIX && !OS_MACOSX && !OS_ANDROID #endif // OS_POSIX && !OS_MAC && !OS_ANDROID
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
void ShellMainDelegate::ZygoteForked() { void ShellMainDelegate::ZygoteForked() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment