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} --- device/hid/device_monitor_linux.h | 2 +- device/hid/hid_service.h | 2 +- device/hid/input_service_linux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'device/hid') diff --git a/device/hid/device_monitor_linux.h b/device/hid/device_monitor_linux.h index 8cec73a..d05e31b 100644 --- a/device/hid/device_monitor_linux.h +++ b/device/hid/device_monitor_linux.h @@ -63,7 +63,7 @@ class DeviceMonitorLinux : public base::MessageLoop::DestructionObserver, int monitor_fd_; base::MessagePumpLibevent::FileDescriptorWatcher monitor_watcher_; - ObserverList observers_; + base::ObserverList observers_; base::ThreadChecker thread_checker_; diff --git a/device/hid/hid_service.h b/device/hid/hid_service.h index 4a4d3ad..1634a64 100644 --- a/device/hid/hid_service.h +++ b/device/hid/hid_service.h @@ -89,7 +89,7 @@ class HidService { DeviceMap devices_; bool enumeration_ready_; std::vector pending_enumerations_; - ObserverList observer_list_; + base::ObserverList observer_list_; DISALLOW_COPY_AND_ASSIGN(HidService); }; diff --git a/device/hid/input_service_linux.h b/device/hid/input_service_linux.h index 7eda3bb..d13be95 100644 --- a/device/hid/input_service_linux.h +++ b/device/hid/input_service_linux.h @@ -84,7 +84,7 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver { bool CalledOnValidThread() const; DeviceMap devices_; - ObserverList observers_; + base::ObserverList observers_; private: friend struct base::DefaultDeleter; -- cgit v1.1