| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index 85dfeca4eda52803e6761c715456753d3f39a1bd..2665cf3e781995e5aca363f1f67fc064a9973def 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -32,6 +32,7 @@
|
| #include "chromeos/dbus/nfc_manager_client.h"
|
| #include "chromeos/dbus/nfc_tag_client.h"
|
| #include "chromeos/dbus/permission_broker_client.h"
|
| +#include "chromeos/dbus/power_data_collector.h"
|
| #include "chromeos/dbus/power_manager_client.h"
|
| #include "chromeos/dbus/power_policy_controller.h"
|
| #include "chromeos/dbus/session_manager_client.h"
|
| @@ -120,6 +121,9 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| power_policy_controller_.reset(
|
| new PowerPolicyController(this, power_manager_client_.get()));
|
|
|
| + power_data_collector_.reset(
|
| + new PowerDataCollector(power_manager_client_.get()));
|
| +
|
| shill_stub_helper::SetupDefaultEnvironment();
|
|
|
| // This must be called after the list of clients so they've each had a
|
| @@ -265,6 +269,10 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| return power_policy_controller_.get();
|
| }
|
|
|
| + virtual PowerDataCollector* GetPowerDataCollector() OVERRIDE {
|
| + return power_data_collector_.get();
|
| + }
|
| +
|
| virtual SessionManagerClient* GetSessionManagerClient() OVERRIDE {
|
| return session_manager_client_.get();
|
| }
|
| @@ -378,6 +386,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
|
| scoped_ptr<UpdateEngineClient> update_engine_client_;
|
| scoped_ptr<IBusClient> ibus_client_;
|
| scoped_ptr<PowerPolicyController> power_policy_controller_;
|
| + scoped_ptr<PowerDataCollector> power_data_collector_;
|
|
|
| };
|
|
|
|
|