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 /components/pairing | |
| 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 'components/pairing')
4 files changed, 4 insertions, 4 deletions
diff --git a/components/pairing/bluetooth_controller_pairing_controller.h b/components/pairing/bluetooth_controller_pairing_controller.h index ab67aed..ecd8656 100644 --- a/components/pairing/bluetooth_controller_pairing_controller.h +++ b/components/pairing/bluetooth_controller_pairing_controller.h @@ -113,7 +113,7 @@ class BluetoothControllerPairingController scoped_ptr<ProtoDecoder> proto_decoder_; base::ThreadChecker thread_checker_; - ObserverList<ControllerPairingController::Observer> observers_; + base::ObserverList<ControllerPairingController::Observer> observers_; base::WeakPtrFactory<BluetoothControllerPairingController> ptr_factory_; DISALLOW_COPY_AND_ASSIGN(BluetoothControllerPairingController); diff --git a/components/pairing/bluetooth_host_pairing_controller.h b/components/pairing/bluetooth_host_pairing_controller.h index 1873935..1724cd0 100644 --- a/components/pairing/bluetooth_host_pairing_controller.h +++ b/components/pairing/bluetooth_host_pairing_controller.h @@ -111,7 +111,7 @@ class BluetoothHostPairingController scoped_ptr<ProtoDecoder> proto_decoder_; base::ThreadChecker thread_checker_; - ObserverList<Observer> observers_; + base::ObserverList<Observer> observers_; base::WeakPtrFactory<BluetoothHostPairingController> ptr_factory_; DISALLOW_COPY_AND_ASSIGN(BluetoothHostPairingController); diff --git a/components/pairing/fake_controller_pairing_controller.h b/components/pairing/fake_controller_pairing_controller.h index c1801e2..a342539 100644 --- a/components/pairing/fake_controller_pairing_controller.h +++ b/components/pairing/fake_controller_pairing_controller.h @@ -93,7 +93,7 @@ class FakeControllerPairingController void PairingStageChanged(Stage new_stage) override; void DiscoveredDevicesListChanged() override; - ObserverList<ControllerPairingController::Observer> observers_; + base::ObserverList<ControllerPairingController::Observer> observers_; Stage current_stage_; std::string confirmation_code_; std::string preset_confirmation_code_; diff --git a/components/pairing/fake_host_pairing_controller.h b/components/pairing/fake_host_pairing_controller.h index fcca881..862e3d5 100644 --- a/components/pairing/fake_host_pairing_controller.h +++ b/components/pairing/fake_host_pairing_controller.h @@ -52,7 +52,7 @@ class FakeHostPairingController // HostPairingController::Observer: void PairingStageChanged(Stage new_stage) override; - ObserverList<Observer> observers_; + base::ObserverList<Observer> observers_; Stage current_stage_; std::string device_name_; std::string confirmation_code_; |