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

Unified Diff: chrome/browser/chrome_browser_main_linux.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: android build fix per cjhopman 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_browser_main_linux.cc
===================================================================
--- chrome/browser/chrome_browser_main_linux.cc (revision 211410)
+++ chrome/browser/chrome_browser_main_linux.cc (working copy)
@@ -12,7 +12,6 @@
#include "content/public/browser/browser_thread.h"
#endif
-#if defined(USE_LINUX_BREAKPAD)
#include <stdlib.h>
Lei Zhang 2013/07/15 20:55:35 Can you integrate lines 15-23 with lines 7-8?
jam 2013/07/15 21:15:28 Done.
#include "base/command_line.h"
@@ -30,11 +29,8 @@
#include "chromeos/chromeos_switches.h"
#endif
-#endif // defined(USE_LINUX_BREAKPAD)
-
namespace {
-#if defined(USE_LINUX_BREAKPAD)
#if !defined(OS_CHROMEOS)
void GetLinuxDistroCallback() {
base::GetLinuxDistro(); // Initialize base::linux_distro if needed.
@@ -102,7 +98,6 @@
return breakpad_enabled;
}
-#endif // defined(USE_LINUX_BREAKPAD)
} // namespace
@@ -115,7 +110,6 @@
}
void ChromeBrowserMainPartsLinux::PreProfileInit() {
-#if defined(USE_LINUX_BREAKPAD)
#if !defined(OS_CHROMEOS)
// Needs to be called after we have chrome::DIR_USER_DATA and
// g_browser_process. This happens in PreCreateThreads.
@@ -126,7 +120,6 @@
if (IsCrashReportingEnabled(local_state()))
InitCrashReporter();
-#endif
#if !defined(OS_CHROMEOS)
const base::FilePath kDefaultMtabPath("/etc/mtab");
@@ -139,12 +132,8 @@
void ChromeBrowserMainPartsLinux::PostProfileInit() {
ChromeBrowserMainPartsPosix::PostProfileInit();
-#if defined(USE_LINUX_BREAKPAD)
g_browser_process->metrics_service()->RecordBreakpadRegistration(
IsCrashReporterEnabled());
-#else
- g_browser_process->metrics_service()->RecordBreakpadRegistration(false);
-#endif
}
void ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() {

Powered by Google App Engine
This is Rietveld 408576698