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 /device/hid | |
| 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 'device/hid')
| -rw-r--r-- | device/hid/device_monitor_linux.h | 2 | ||||
| -rw-r--r-- | device/hid/hid_service.h | 2 | ||||
| -rw-r--r-- | device/hid/input_service_linux.h | 2 |
3 files changed, 3 insertions, 3 deletions
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<Observer> observers_; + base::ObserverList<Observer> 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<GetDevicesCallback> pending_enumerations_; - ObserverList<Observer> observer_list_; + base::ObserverList<Observer> 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<Observer> observers_; + base::ObserverList<Observer> observers_; private: friend struct base::DefaultDeleter<InputServiceLinux>; |