diff options
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_; |