Index: ash/shell.cc |
diff --git a/ash/shell.cc b/ash/shell.cc |
index 2b73c9807cafb754d64f64aa989c7a9a77fae265..4376dcae3069e1eb182c3ef358b15eb6440e2c4f 100644 |
--- a/ash/shell.cc |
+++ b/ash/shell.cc |
@@ -141,6 +141,7 @@ |
#include "base/bind_helpers.h" |
#include "base/sys_info.h" |
#include "chromeos/dbus/dbus_thread_manager.h" |
+#include "device/bluetooth/dbus/bluez_dbus_manager.h" |
#include "ui/chromeos/user_activity_power_manager_notifier.h" |
#include "ui/display/chromeos/display_configurator.h" |
#endif // defined(OS_CHROMEOS) |
@@ -854,6 +855,14 @@ void Shell::Init(const ShellInitParams& init_params) { |
// The DBusThreadManager must outlive this Shell. See the DCHECK in ~Shell. |
chromeos::DBusThreadManager* dbus_thread_manager = |
chromeos::DBusThreadManager::Get(); |
+ |
+ if (!bluez::BluezDBusManager::IsInitialized()) { |
+ bluez::BluezDBusManager::Initialize( |
+ dbus_thread_manager->GetSystemBus(), |
+ dbus_thread_manager->IsUsingStub( |
+ chromeos::DBusClientBundle::BLUETOOTH)); |
+ } |
oshima
2015/09/28 17:34:12
can you move this to AshTestHelper? That's where D
rkc
2015/09/28 17:53:13
Done.
|
+ |
projecting_observer_.reset( |
new ProjectingObserver(dbus_thread_manager->GetPowerManagerClient())); |
display_configurator_->AddObserver(projecting_observer_.get()); |