| Index: chromeos/dbus/power_manager_client.cc
|
| diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
|
| index 89d6113fd844dfc4ca2e8846b4781c4364e18d2e..a5d2322d3b1dd6fe14965d0c9e014d50a2bc8506 100644
|
| --- a/chromeos/dbus/power_manager_client.cc
|
| +++ b/chromeos/dbus/power_manager_client.cc
|
| @@ -728,7 +728,7 @@ class PowerManagerClientImpl : public PowerManagerClient {
|
| base::PlatformThreadId origin_thread_id_;
|
|
|
| dbus::ObjectProxy* power_manager_proxy_;
|
| - ObserverList<Observer> observers_;
|
| + base::ObserverList<Observer> observers_;
|
|
|
| // The delay_id_ obtained from the RegisterSuspendDelay request.
|
| int32_t suspend_delay_id_;
|
| @@ -976,7 +976,7 @@ class PowerManagerClientStubImpl : public PowerManagerClient {
|
| double brightness_;
|
| int pause_count_;
|
| int cycle_count_;
|
| - ObserverList<Observer> observers_;
|
| + base::ObserverList<Observer> observers_;
|
| base::RepeatingTimer<PowerManagerClientStubImpl> update_timer_;
|
| power_manager::PowerSupplyProperties props_;
|
|
|
|
|