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

Side by Side 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, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 // dump. 561 // dump.
562 // 562 //
563 // What we do: 563 // What we do:
564 // * We only pass crashes for foreground processes to Apple's Crash 564 // * We only pass crashes for foreground processes to Apple's Crash
565 // reporter. At the time of this writing, that means just the Browser 565 // reporter. At the time of this writing, that means just the Browser
566 // process. 566 // process.
567 // * If Breakpad is enabled, it will pass browser crashes to Crash Reporter 567 // * If Breakpad is enabled, it will pass browser crashes to Crash Reporter
568 // itself. 568 // itself.
569 // * If Breakpad is disabled, we only turn on Crash Reporter for the 569 // * If Breakpad is disabled, we only turn on Crash Reporter for the
570 // Browser process in release mode. 570 // Browser process in release mode.
571 if (base::mac::IsBackgroundOnlyProcess() || 571 if (!command_line.HasSwitch(switches::kDisableBreakpad)) {
572 breakpad::IsCrashReporterEnabled() || 572 bool disable_apple_crash_reporter = is_debug_build ||
573 is_debug_build) { 573 base::mac::IsBackgroundOnlyProcess();
574 base::mac::DisableOSCrashDumps(); 574 if (!breakpad::IsCrashReporterEnabled() && disable_apple_crash_reporter) {
575 base::mac::DisableOSCrashDumps();
576 }
575 } 577 }
576 578
577 // Mac Chrome is packaged with a main app bundle and a helper app bundle. 579 // Mac Chrome is packaged with a main app bundle and a helper app bundle.
578 // The main app bundle should only be used for the browser process, so it 580 // The main app bundle should only be used for the browser process, so it
579 // should never see a --type switch (switches::kProcessType). Likewise, 581 // should never see a --type switch (switches::kProcessType). Likewise,
580 // the helper should always have a --type switch. 582 // the helper should always have a --type switch.
581 // 583 //
582 // This check is done this late so there is already a call to 584 // This check is done this late so there is already a call to
583 // base::mac::IsBackgroundOnlyProcess(), so there is no change in 585 // base::mac::IsBackgroundOnlyProcess(), so there is no change in
584 // startup/initialization order. 586 // startup/initialization order.
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 } 936 }
935 937
936 content::ContentUtilityClient* 938 content::ContentUtilityClient*
937 ChromeMainDelegate::CreateContentUtilityClient() { 939 ChromeMainDelegate::CreateContentUtilityClient() {
938 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 940 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
939 return NULL; 941 return NULL;
940 #else 942 #else
941 return g_chrome_content_utility_client.Pointer(); 943 return g_chrome_content_utility_client.Pointer();
942 #endif 944 #endif
943 } 945 }
OLDNEW
« 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