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 "chrome/grit/chromium_strings.h" |
11 #include "components/crash/content/app/breakpad_linux.h" | 11 #include "components/crash/content/app/breakpad_linux.h" |
12 #include "components/metrics/metrics_service.h" | 12 #include "components/metrics/metrics_service.h" |
| 13 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
| 14 #include "device/bluetooth/dbus/dbus_thread_manager_linux.h" |
13 #include "media/audio/audio_manager.h" | 15 #include "media/audio/audio_manager.h" |
14 #include "ui/base/l10n/l10n_util.h" | 16 #include "ui/base/l10n/l10n_util.h" |
15 | 17 |
16 #if !defined(OS_CHROMEOS) | 18 #if !defined(OS_CHROMEOS) |
17 #include "base/linux_util.h" | 19 #include "base/linux_util.h" |
18 #include "chrome/browser/sxs_linux.h" | 20 #include "chrome/browser/sxs_linux.h" |
19 #include "content/public/browser/browser_thread.h" | 21 #include "content/public/browser/browser_thread.h" |
20 #endif | 22 #endif |
21 | 23 |
22 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( | 24 ChromeBrowserMainPartsLinux::ChromeBrowserMainPartsLinux( |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 | 57 |
56 ChromeBrowserMainPartsPosix::PreProfileInit(); | 58 ChromeBrowserMainPartsPosix::PreProfileInit(); |
57 } | 59 } |
58 | 60 |
59 void ChromeBrowserMainPartsLinux::PostProfileInit() { | 61 void ChromeBrowserMainPartsLinux::PostProfileInit() { |
60 ChromeBrowserMainPartsPosix::PostProfileInit(); | 62 ChromeBrowserMainPartsPosix::PostProfileInit(); |
61 | 63 |
62 g_browser_process->metrics_service()->RecordBreakpadRegistration( | 64 g_browser_process->metrics_service()->RecordBreakpadRegistration( |
63 breakpad::IsCrashReporterEnabled()); | 65 breakpad::IsCrashReporterEnabled()); |
64 } | 66 } |
| 67 |
| 68 void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() { |
| 69 #if !defined(OS_CHROMEOS) |
| 70 bluez::DBusThreadManagerLinux::Initialize(); |
| 71 bluez::BluezDBusManager::Initialize( |
| 72 bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false); |
| 73 #endif |
| 74 |
| 75 ChromeBrowserMainPartsPosix::PostMainMessageLoopStart(); |
| 76 } |
| 77 |
| 78 void ChromeBrowserMainPartsLinux::PostDestroyThreads() { |
| 79 #if !defined(OS_CHROMEOS) |
| 80 bluez::BluezDBusManager::Shutdown(); |
| 81 bluez::DBusThreadManagerLinux::Shutdown(); |
| 82 #endif |
| 83 |
| 84 ChromeBrowserMainPartsPosix::PostDestroyThreads(); |
| 85 } |
OLD | NEW |