Index: chrome/app/chrome_main_delegate.cc |
=================================================================== |
--- chrome/app/chrome_main_delegate.cc (revision 211696) |
+++ chrome/app/chrome_main_delegate.cc (working copy) |
@@ -48,13 +48,11 @@ |
#include "base/mac/mac_util.h" |
#include "base/mac/os_crash_dumps.h" |
#include "chrome/app/breakpad_mac.h" |
-#include "chrome/app/chrome_breakpad_client.h" |
#include "chrome/app/chrome_main_mac.h" |
#include "chrome/browser/mac/relauncher.h" |
#include "chrome/common/chrome_paths_internal.h" |
#include "chrome/common/mac/cfbundle_blocker.h" |
#include "chrome/common/mac/objc_zombie.h" |
-#include "components/breakpad/breakpad_client.h" |
#include "grit/chromium_strings.h" |
#include "ui/base/l10n/l10n_util_mac.h" |
#endif |
@@ -62,6 +60,8 @@ |
#if defined(OS_POSIX) |
#include <locale.h> |
#include <signal.h> |
+#include "chrome/app/chrome_breakpad_client.h" |
+#include "components/breakpad/breakpad_client.h" |
#endif |
#if !defined(DISABLE_NACL) && defined(OS_LINUX) |
@@ -89,10 +89,8 @@ |
#include "ui/base/x/x11_util.h" |
#endif |
-#if defined(USE_LINUX_BREAKPAD) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
#include "chrome/app/breakpad_linux.h" |
-#include "chrome/app/chrome_breakpad_client.h" |
-#include "components/breakpad/breakpad_client.h" |
#endif |
base::LazyInstance<chrome::ChromeContentBrowserClient> |
@@ -104,7 +102,7 @@ |
base::LazyInstance<chrome::ChromeContentPluginClient> |
g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; |
-#if defined(OS_MACOSX) || defined(USE_LINUX_BREAKPAD) |
+#if defined(OS_POSIX) |
base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky |
g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; |
#endif |
@@ -514,7 +512,7 @@ |
std::string process_type = |
command_line.GetSwitchValueASCII(switches::kProcessType); |
-#if defined(OS_MACOSX) || defined(USE_LINUX_BREAKPAD) |
+#if defined(OS_POSIX) |
breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); |
#endif |
@@ -635,7 +633,7 @@ |
#endif // defined(OS_MACOSX) |
} |
-#if defined(USE_LINUX_BREAKPAD) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain |
// sets this up for the browser process in a different manner. Zygotes |
// need to call InitCrashReporter() in RunZygote(). |
@@ -742,7 +740,7 @@ |
SetUpProfilingShutdownHandler(); |
} |
-#if defined(USE_LINUX_BREAKPAD) |
+#if defined(OS_POSIX) && !defined(OS_MACOSX) |
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets |
// this up for the browser process in a different manner. |
InitCrashReporter(); |