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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 18770006: Remove USE_LINUX_BREAKPAD ifdef since we don't need it for chromium anymore. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: lei's comments + sync Created 7 years, 5 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
Index: chrome/browser/chrome_content_browser_client.cc
===================================================================
--- chrome/browser/chrome_content_browser_client.cc (revision 211696)
+++ chrome/browser/chrome_content_browser_client.cc (working copy)
@@ -1293,16 +1293,17 @@
void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
CommandLine* command_line, int child_process_id) {
-#if defined(USE_LINUX_BREAKPAD)
+#if defined(OS_MACOSX)
if (IsCrashReporterEnabled()) {
command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
- child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
+ child_process_logging::GetClientId());
}
-#elif defined(OS_MACOSX)
+#elif defined(OS_POSIX)
if (IsCrashReporterEnabled()) {
command_line->AppendSwitchASCII(switches::kEnableCrashReporter,
- child_process_logging::GetClientId());
+ child_process_logging::GetClientId() + "," + base::GetLinuxDistro());
}
+
#endif // OS_MACOSX
Sam Clegg 2013/07/15 23:28:30 Does this comment need updating?
if (logging::DialogsAreSuppressed())
@@ -2402,7 +2403,6 @@
mappings->push_back(FileDescriptorInfo(kAndroidUIResourcesPakDescriptor,
FileDescriptor(f, true)));
-#if defined(USE_LINUX_BREAKPAD)
if (IsCrashReporterEnabled()) {
f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id);
if (f == base::kInvalidPlatformFileValue) {
@@ -2413,7 +2413,6 @@
FileDescriptor(f, true)));
}
}
-#endif // defined(USE_LINUX_BREAKPAD)
#else
int crash_signal_fd = GetCrashSignalFD(command_line);
« no previous file with comments | « chrome/browser/chrome_browser_main_linux.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698