diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 00:14:27 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 00:14:27 +0000 |
| commit | cbd5fd5ead41910dce8a20ec53ce1195548440d5 (patch) | |
| tree | 13e0a2a823ba8ae31d829e7098763ebd1a7d0a68 /chrome/common | |
| parent | 0c22345d5e500ad60e51b7a4c4da29fe3cf6ff64 (diff) | |
| download | chromium_src-cbd5fd5ead41910dce8a20ec53ce1195548440d5.zip chromium_src-cbd5fd5ead41910dce8a20ec53ce1195548440d5.tar.gz chromium_src-cbd5fd5ead41910dce8a20ec53ce1195548440d5.tar.bz2 | |
Allow Chromium Linux to be built with Breakpad. Enable Linux CHROME_HEADLESS support. (Try 2)
TEST=none
BUG=19663
Original Review URL: http://codereview.chromium.org/173095
Review URL: http://codereview.chromium.org/173397
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24378 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/child_process_host.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index 1fa91f9..cf67d15 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -145,18 +145,18 @@ std::wstring ChildProcessHost::GetChildPath() { // static void ChildProcessHost::SetCrashReporterCommandLine(CommandLine* command_line) { -#if defined(OS_POSIX) - if (GoogleUpdateSettings::GetCollectStatsConsent()) { -#if defined(OS_LINUX) +#if defined(USE_LINUX_BREAKPAD) + const bool unattended = (getenv("CHROME_HEADLESS") != NULL); + if (unattended || GoogleUpdateSettings::GetCollectStatsConsent()) { command_line->AppendSwitchWithValue(switches::kEnableCrashReporter, ASCIIToWide(google_update::linux_guid + "," + base::GetLinuxDistro())); -#else // !OS_LINUX - command_line->AppendSwitch(switches::kEnableCrashReporter); -#endif // !OS_LINUX } -#endif // OS_POSIX +#elif defined(OS_MACOSX) + if (GoogleUpdateSettings::GetCollectStatsConsent()) + command_line->AppendSwitch(switches::kEnableCrashReporter); +#endif // OS_MACOSX } bool ChildProcessHost::CreateChannel() { |