diff options
| author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
| commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
| tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /chromeos/dbus/power_manager_client.cc | |
| parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
| download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 | |
Replace more ObserverList with base::ObserverList.
This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)
Review URL: https://codereview.chromium.org/1162943002
Cr-Commit-Position: refs/heads/master@{#332626}
Diffstat (limited to 'chromeos/dbus/power_manager_client.cc')
| -rw-r--r-- | chromeos/dbus/power_manager_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc index 89d6113..a5d2322 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_; |