| 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 <fontconfig/fontconfig.h> | 7 #include <fontconfig/fontconfig.h> |
| 8 | 8 |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/grit/chromium_strings.h" |
| 10 #include "components/crash/app/breakpad_linux.h" | 11 #include "components/crash/app/breakpad_linux.h" |
| 11 #include "components/metrics/metrics_service.h" | 12 #include "components/metrics/metrics_service.h" |
| 13 #include "media/audio/audio_manager.h" |
| 14 #include "ui/base/l10n/l10n_util.h" |
| 12 | 15 |
| 13 #if !defined(OS_CHROMEOS) | 16 #if !defined(OS_CHROMEOS) |
| 14 #include "base/linux_util.h" | 17 #include "base/linux_util.h" |
| 15 #include "chrome/browser/sxs_linux.h" | 18 #include "chrome/browser/sxs_linux.h" |
| 16 #include "content/public/browser/browser_thread.h" | 19 #include "content/public/browser/browser_thread.h" |
| 17 #endif | 20 #endif |
| 18 | 21 |
| 19 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( | 22 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( |
| 20 const content::MainFunctionParams& parameters) | 23 const content::MainFunctionParams& parameters) |
| 21 : ChromeBrowserMainPartsPosix(parameters) { | 24 : ChromeBrowserMainPartsPosix(parameters) { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 40 // base::GetLinuxDistro() will initialize its value if needed. | 43 // base::GetLinuxDistro() will initialize its value if needed. |
| 41 content::BrowserThread::PostBlockingPoolTask( | 44 content::BrowserThread::PostBlockingPoolTask( |
| 42 FROM_HERE, | 45 FROM_HERE, |
| 43 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); | 46 base::Bind(base::IgnoreResult(&base::GetLinuxDistro))); |
| 44 | 47 |
| 45 content::BrowserThread::PostBlockingPoolTask( | 48 content::BrowserThread::PostBlockingPoolTask( |
| 46 FROM_HERE, | 49 FROM_HERE, |
| 47 base::Bind(&sxs_linux::AddChannelMarkToUserDataDir)); | 50 base::Bind(&sxs_linux::AddChannelMarkToUserDataDir)); |
| 48 #endif | 51 #endif |
| 49 | 52 |
| 53 media::AudioManager::SetGlobalAppName( |
| 54 l10n_util::GetStringUTF8(IDS_SHORT_PRODUCT_NAME)); |
| 55 |
| 50 ChromeBrowserMainPartsPosix::PreProfileInit(); | 56 ChromeBrowserMainPartsPosix::PreProfileInit(); |
| 51 } | 57 } |
| 52 | 58 |
| 53 void ChromeBrowserMainPartsLinux::PostProfileInit() { | 59 void ChromeBrowserMainPartsLinux::PostProfileInit() { |
| 54 ChromeBrowserMainPartsPosix::PostProfileInit(); | 60 ChromeBrowserMainPartsPosix::PostProfileInit(); |
| 55 | 61 |
| 56 g_browser_process->metrics_service()->RecordBreakpadRegistration( | 62 g_browser_process->metrics_service()->RecordBreakpadRegistration( |
| 57 breakpad::IsCrashReporterEnabled()); | 63 breakpad::IsCrashReporterEnabled()); |
| 58 } | 64 } |
| OLD | NEW |