Chromium Code Reviews| 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() { |