Mac: fix breakpad build errors

rogerwang · rogerwang · commit 977a1619baab · 2013-10-04T22:14:26.000+08:00
diff --git a/src/chrome_breakpad_client_mac.mm b/src/chrome_breakpad_client_mac.mm
@@ -7,40 +7,9 @@
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 
-<<<<<<< HEAD
-#if !defined(DISABLE_NACL)
-#import "breakpad/src/client/mac/Framework/Breakpad.h"
-#include "components/nacl/common/nacl_switches.h"
-#include "native_client/src/trusted/service_runtime/osx/crash_filter.h"
-#endif
-
-namespace chrome {
-
-namespace {
-
-#if !defined(DISABLE_NACL)
-bool NaClBreakpadCrashFilter(int exception_type,
-                             int exception_code,
-                             mach_port_t crashing_thread,
-                             void* context) {
-  return !NaClMachThreadIsInUntrusted(crashing_thread);
-}
-#endif
-
-}  // namespace
-
-void ChromeBreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) {
-#if !defined(DISABLE_NACL)
-  if (CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          switches::kProcessType) == switches::kNaClLoaderProcess) {
-    BreakpadSetFilterCallback(breakpad, NaClBreakpadCrashFilter, NULL);
-  }
-#endif
-=======
 namespace chrome {
 
 void ChromeBreakpadClient::InstallAdditionalFilters(BreakpadRef breakpad) {
->>>>>>> 75583278d6e056c59e5acca60221da6f73756624
 }
 
 }  // namespace chrome
diff --git a/src/shell_main_delegate.h b/src/shell_main_delegate.h
@@ -29,7 +29,7 @@ class ShellMainDelegate : public ContentMainDelegate {
   virtual ContentRendererClient* CreateContentRendererClient() OVERRIDE;
 
   static void InitializeResourceBundle();
-#if defined(OS_POSIX) && !defined(OS_ANDROID)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   virtual void ZygoteForked() OVERRIDE;
 #endif
 
