From 236d317f450601fbb56756b0b5ca802659a045f6 Mon Sep 17 00:00:00 2001 From: brettw Date: Wed, 3 Jun 2015 09:31:43 -0700 Subject: 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} --- chromeos/dbus/power_manager_client.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromeos/dbus/power_manager_client.cc') 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 observers_; + base::ObserverList 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 observers_; + base::ObserverList observers_; base::RepeatingTimer update_timer_; power_manager::PowerSupplyProperties props_; -- cgit v1.1