Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
index 96098f5124e86f2a6e4a77e6ca782848434290be..96b3c6c9706fb6755c666eb02b23596cd0017792 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -118,6 +118,7 @@ |
#include "content/public/browser/notification_service.h" |
#include "content/public/common/main_function_params.h" |
#include "device/bluetooth/bluetooth_adapter_factory.h" |
+#include "device/bluetooth/dbus/bluez_dbus_manager.h" |
#include "media/audio/sounds/sounds_manager.h" |
#include "net/base/network_change_notifier.h" |
#include "net/socket/ssl_server_socket.h" |
@@ -168,6 +169,11 @@ class DBusServices { |
// Initialize DBusThreadManager for the browser. This must be done after |
// the main message loop is started, as it uses the message loop. |
DBusThreadManager::Initialize(); |
+ |
+ // This can only be initialized after DBusThreadManager has been |
+ // initialized. |
stevenjb
2015/09/17 21:48:01
See my other comments, but we should avoid this im
rkc
2015/09/21 18:54:22
Done.
|
+ bluez::BluezDBusManager::Initialize(); |
+ |
PowerPolicyController::Initialize( |
DBusThreadManager::Get()->GetPowerManagerClient()); |