Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Side by Side Diff: components/pairing/fake_controller_pairing_controller.h

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_ 5 #ifndef COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_
6 #define COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_ 6 #define COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_
7 7
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 void ChangeStage(Stage new_stage); 86 void ChangeStage(Stage new_stage);
87 void ChangeStageLater(Stage new_stage); 87 void ChangeStageLater(Stage new_stage);
88 void ExecuteDiscoveryEvent(size_t event_position); 88 void ExecuteDiscoveryEvent(size_t event_position);
89 void DeviceFound(const std::string& device_id); 89 void DeviceFound(const std::string& device_id);
90 void DeviceLost(const std::string& device_id); 90 void DeviceLost(const std::string& device_id);
91 91
92 // Overridden from ui::ControllerPairingController::Observer: 92 // Overridden from ui::ControllerPairingController::Observer:
93 void PairingStageChanged(Stage new_stage) override; 93 void PairingStageChanged(Stage new_stage) override;
94 void DiscoveredDevicesListChanged() override; 94 void DiscoveredDevicesListChanged() override;
95 95
96 ObserverList<ControllerPairingController::Observer> observers_; 96 base::ObserverList<ControllerPairingController::Observer> observers_;
97 Stage current_stage_; 97 Stage current_stage_;
98 std::string confirmation_code_; 98 std::string confirmation_code_;
99 std::string preset_confirmation_code_; 99 std::string preset_confirmation_code_;
100 base::TimeDelta async_duration_; 100 base::TimeDelta async_duration_;
101 DiscoveryScenario discovery_scenario_; 101 DiscoveryScenario discovery_scenario_;
102 std::set<std::string> discovered_devices_; 102 std::set<std::string> discovered_devices_;
103 std::string choosen_device_; 103 std::string choosen_device_;
104 bool should_fail_on_connecting_; 104 bool should_fail_on_connecting_;
105 Stage connection_lost_begin_; 105 Stage connection_lost_begin_;
106 Stage connection_lost_end_; 106 Stage connection_lost_end_;
107 bool enrollment_should_fail_; 107 bool enrollment_should_fail_;
108 108
109 DISALLOW_COPY_AND_ASSIGN(FakeControllerPairingController); 109 DISALLOW_COPY_AND_ASSIGN(FakeControllerPairingController);
110 }; 110 };
111 111
112 } // namespace pairing_chromeos 112 } // namespace pairing_chromeos
113 113
114 #endif // COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_ 114 #endif // COMPONENTS_PAIRING_FAKE_CONTROLLER_PAIRING_CONTROLLER_H_
OLDNEW
« no previous file with comments | « components/pairing/bluetooth_host_pairing_controller.h ('k') | components/pairing/fake_host_pairing_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698