Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / chrome / app / chrome_main_delegate.cc

diff --git a/src/chrome/app/chrome_main_delegate.cc b/src/chrome/app/chrome_main_delegate.cc
index 050b184..736b74d 100644 (file)
--- a/src/chrome/app/chrome_main_delegate.cc
+++ b/src/chrome/app/chrome_main_delegate.cc
@@ -560,10 +560,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.