summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authorjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 15:55:02 +0000
committerjeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-26 15:55:02 +0000
commitad5f54471a107a27a7d975f38651426b6c042fc3 (patch)
tree53f768a325cbe697577ec4773bf9d0c3d40a6bec /chrome/app/chrome_dll_main.cc
parentb5c5cf54b6e984cbf8061da067398e90f9280d0d (diff)
downloadchromium_src-ad5f54471a107a27a7d975f38651426b6c042fc3.zip
chromium_src-ad5f54471a107a27a7d975f38651426b6c042fc3.tar.gz
chromium_src-ad5f54471a107a27a7d975f38651426b6c042fc3.tar.bz2
First stab at Mac breakpad support.
breakpad_mac.mm still needs some work, there's a bunch of scaffolding in there referring to a custom version of Breakpad I've got going locally. Review URL: http://codereview.chromium.org/53075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 82539ef..1ef0dd0 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -34,6 +34,9 @@
#if defined(OS_WIN)
#include "base/win_util.h"
#endif
+#if defined(OS_MACOSX)
+#include "chrome/app/breakpad_mac.h"
+#endif
#include "chrome/app/scoped_ole_initializer.h"
#include "chrome/browser/renderer_host/render_process_host.h"
#include "chrome/common/chrome_constants.h"
@@ -246,7 +249,11 @@ int ChromeMain(int argc, const char** argv) {
#endif
#if defined(OS_MACOSX)
- DebugUtil::DisableOSCrashDumps();
+ // If Breakpad is not present then turn off os crash dumps so we don't have
+ // to wait eons for Apple's Crash Reporter to generate a dump.
+ if (!IsCrashReporterEnabled()) {
+ DebugUtil::DisableOSCrashDumps();
+ }
#endif
RegisterInvalidParamHandler();