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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 602793002: Revert "Make logic for disabling OS crash catcher on OSX match comment." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 8bd915997281c03171ad3ebd2e00edc4ff6fb4c5..13c3378184927538110af710a4bb8993d318d760 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -568,10 +568,12 @@ void ChromeMainDelegate::InitMacCrashReporter(
// itself.
// * If Breakpad is disabled, we only turn on Crash Reporter for the
// Browser process in release mode.
- if (base::mac::IsBackgroundOnlyProcess() ||
- breakpad::IsCrashReporterEnabled() ||
- is_debug_build) {
- base::mac::DisableOSCrashDumps();
+ if (!command_line.HasSwitch(switches::kDisableBreakpad)) {
+ bool disable_apple_crash_reporter = is_debug_build ||
+ base::mac::IsBackgroundOnlyProcess();
+ if (!breakpad::IsCrashReporterEnabled() && disable_apple_crash_reporter) {
+ base::mac::DisableOSCrashDumps();
+ }
}
// Mac Chrome is packaged with a main app bundle and a helper app bundle.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698