| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chrome_browser_main_linux.h" | 5 #include "chrome/browser/chrome_browser_main_linux.h" |
| 6 | 6 |
| 7 #include <stdlib.h> | 7 #include <stdlib.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/linux_util.h" | 10 #include "base/linux_util.h" |
| 11 #include "base/prefs/pref_service.h" | 11 #include "base/prefs/pref_service.h" |
| 12 #include "chrome/app/breakpad_linux.h" | |
| 13 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 14 #include "chrome/browser/metrics/metrics_service.h" | 13 #include "chrome/browser/metrics/metrics_service.h" |
| 15 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/common/env_vars.h" | 15 #include "chrome/common/env_vars.h" |
| 17 #include "chrome/common/pref_names.h" | 16 #include "chrome/common/pref_names.h" |
| 17 #include "components/breakpad/app/breakpad_linux.h" |
| 18 | 18 |
| 19 #if defined(OS_CHROMEOS) | 19 #if defined(OS_CHROMEOS) |
| 20 #include "chrome/browser/chromeos/settings/cros_settings.h" | 20 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 21 #include "chrome/common/chrome_version_info.h" | 21 #include "chrome/common/chrome_version_info.h" |
| 22 #include "chromeos/chromeos_switches.h" | 22 #include "chromeos/chromeos_switches.h" |
| 23 #include "chromeos/settings/cros_settings_names.h" | 23 #include "chromeos/settings/cros_settings_names.h" |
| 24 #else | 24 #else |
| 25 #include "chrome/browser/storage_monitor/storage_monitor_linux.h" | 25 #include "chrome/browser/storage_monitor/storage_monitor_linux.h" |
| 26 #include "chrome/browser/sxs_linux.h" | 26 #include "chrome/browser/sxs_linux.h" |
| 27 #include "content/public/browser/browser_thread.h" | 27 #include "content/public/browser/browser_thread.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 FROM_HERE, | 115 FROM_HERE, |
| 116 base::Bind(&GetLinuxDistroCallback)); | 116 base::Bind(&GetLinuxDistroCallback)); |
| 117 | 117 |
| 118 content::BrowserThread::PostTask( | 118 content::BrowserThread::PostTask( |
| 119 content::BrowserThread::FILE, | 119 content::BrowserThread::FILE, |
| 120 FROM_HERE, | 120 FROM_HERE, |
| 121 base::Bind(&sxs_linux::AddChannelMarkToUserDataDir)); | 121 base::Bind(&sxs_linux::AddChannelMarkToUserDataDir)); |
| 122 #endif | 122 #endif |
| 123 | 123 |
| 124 if (IsCrashReportingEnabled(local_state())) | 124 if (IsCrashReportingEnabled(local_state())) |
| 125 InitCrashReporter(); | 125 breakpad::InitCrashReporter(); |
| 126 | 126 |
| 127 ChromeBrowserMainPartsPosix::PreProfileInit(); | 127 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void ChromeBrowserMainPartsLinux::PostProfileInit() { | 130 void ChromeBrowserMainPartsLinux::PostProfileInit() { |
| 131 ChromeBrowserMainPartsPosix::PostProfileInit(); | 131 ChromeBrowserMainPartsPosix::PostProfileInit(); |
| 132 | 132 |
| 133 g_browser_process->metrics_service()->RecordBreakpadRegistration( | 133 g_browser_process->metrics_service()->RecordBreakpadRegistration( |
| 134 IsCrashReporterEnabled()); | 134 breakpad::IsCrashReporterEnabled()); |
| 135 } | 135 } |
| OLD | NEW |