OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/shell/browser/shell_browser_main_parts.h" | 5 #include "content/shell/browser/shell_browser_main_parts.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 #endif | 124 #endif |
125 } | 125 } |
126 #endif | 126 #endif |
127 | 127 |
128 void ShellBrowserMainParts::PostMainMessageLoopStart() { | 128 void ShellBrowserMainParts::PostMainMessageLoopStart() { |
129 #if defined(OS_ANDROID) | 129 #if defined(OS_ANDROID) |
130 base::MessageLoopForUI::current()->Start(); | 130 base::MessageLoopForUI::current()->Start(); |
131 #endif | 131 #endif |
132 | 132 |
133 #if defined(OS_CHROMEOS) | 133 #if defined(OS_CHROMEOS) |
134 chromeos::DBusThreadManager::Initialize(); | 134 chromeos::DBusThreadManager::Initialize( |
| 135 chromeos::DBusThreadManager::PROCESS_ASH); |
135 bluez::BluezDBusManager::Initialize( | 136 bluez::BluezDBusManager::Initialize( |
136 chromeos::DBusThreadManager::Get()->GetSystemBus(), | 137 chromeos::DBusThreadManager::Get()->GetSystemBus(), |
137 chromeos::DBusThreadManager::Get()->IsUsingFake( | 138 chromeos::DBusThreadManager::Get()->IsUsingFake( |
138 chromeos::DBusClientType::BLUETOOTH)); | 139 chromeos::DBusClientType::BLUETOOTH)); |
139 #elif defined(OS_LINUX) | 140 #elif defined(OS_LINUX) |
140 bluez::DBusBluezManagerWrapperLinux::Initialize(); | 141 bluez::DBusBluezManagerWrapperLinux::Initialize(); |
141 #endif | 142 #endif |
142 } | 143 } |
143 | 144 |
144 void ShellBrowserMainParts::PreEarlyInitialization() { | 145 void ShellBrowserMainParts::PreEarlyInitialization() { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
211 device::BluetoothAdapterFactory::Shutdown(); | 212 device::BluetoothAdapterFactory::Shutdown(); |
212 bluez::BluezDBusManager::Shutdown(); | 213 bluez::BluezDBusManager::Shutdown(); |
213 chromeos::DBusThreadManager::Shutdown(); | 214 chromeos::DBusThreadManager::Shutdown(); |
214 #elif defined(OS_LINUX) | 215 #elif defined(OS_LINUX) |
215 device::BluetoothAdapterFactory::Shutdown(); | 216 device::BluetoothAdapterFactory::Shutdown(); |
216 bluez::DBusBluezManagerWrapperLinux::Shutdown(); | 217 bluez::DBusBluezManagerWrapperLinux::Shutdown(); |
217 #endif | 218 #endif |
218 } | 219 } |
219 | 220 |
220 } // namespace | 221 } // namespace |
OLD | NEW |