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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 53075: First stab at Mac breakpad support. (Closed)
Patch Set: Address John's comments Created 11 years, 9 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 | « chrome/app/breakpad_win.cc ('k') | chrome/app/chrome_exe.vcproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 82539efecea79f177b6f2a2cfe99d87375a70690..1ef0dd08916cac5ac8559a026264d20188d5319d 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();
« no previous file with comments | « chrome/app/breakpad_win.cc ('k') | chrome/app/chrome_exe.vcproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698