summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_main.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 18:19:01 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-19 18:19:01 +0000
commit499f6a610abcf6a057cbb8324f90a07d89f59431 (patch)
treea2fb20543e6d17d39b3f505799f66a04386b60ed /chrome/app/chrome_main.cc
parent6efd79feece53a52496a73da7605865404463b83 (diff)
downloadchromium_src-499f6a610abcf6a057cbb8324f90a07d89f59431.zip
chromium_src-499f6a610abcf6a057cbb8324f90a07d89f59431.tar.gz
chromium_src-499f6a610abcf6a057cbb8324f90a07d89f59431.tar.bz2
Linux: Fix crash reporting for GPU and plugin processes.
BUG=96631 TEST=none Review URL: http://codereview.chromium.org/7931005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main.cc')
-rw-r--r--chrome/app/chrome_main.cc13
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index c5376e4..d24ccf7 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -430,7 +430,6 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
#if defined(OS_MACOSX)
void InitMacCrashReporter(const CommandLine& command_line,
const std::string& process_type) {
-
// TODO(mark): Right now, InitCrashReporter() needs to be called after
// CommandLine::Init() and chrome::RegisterPathProvider(). Ideally,
// Breakpad initialization could occur sooner, preferably even before the
@@ -615,15 +614,15 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
// only do this when ResourcesBundle has been initialized).
SetMacProcessName(process_type);
#endif // defined(OS_MACOSX)
+ }
#if defined(USE_LINUX_BREAKPAD)
- // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain
- // sets this up for the browser process in a different manner. Zygotes
- // need to call InitCrashReporter() in RunZygote().
- if (!process_type.empty() && process_type != switches::kZygoteProcess)
- InitCrashReporter();
+ // Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain
+ // sets this up for the browser process in a different manner. Zygotes
+ // need to call InitCrashReporter() in RunZygote().
+ if (!process_type.empty() && process_type != switches::kZygoteProcess)
+ InitCrashReporter();
#endif
- }
#if defined(OS_CHROMEOS)
// Read and cache ChromeOS version from file,