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

Unified Diff: components/pairing/fake_controller_pairing_controller.h

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: components/pairing/fake_controller_pairing_controller.h
diff --git a/components/pairing/fake_controller_pairing_controller.h b/components/pairing/fake_controller_pairing_controller.h
index 99ac3de24863f7849eb921a0524c18567ad6f892..edb3666fe45058ef9f69145633a00b6543e70e9e 100644
--- a/components/pairing/fake_controller_pairing_controller.h
+++ b/components/pairing/fake_controller_pairing_controller.h
@@ -64,24 +64,24 @@ class FakeControllerPairingController
void SetDiscoveryScenario(const DiscoveryScenario& discovery_scenario);
// Overridden from ControllerPairingController:
- virtual void AddObserver(Observer* observer) OVERRIDE;
- virtual void RemoveObserver(Observer* observer) OVERRIDE;
- virtual Stage GetCurrentStage() OVERRIDE;
- virtual void StartPairing() OVERRIDE;
- virtual DeviceIdList GetDiscoveredDevices() OVERRIDE;
- virtual void ChooseDeviceForPairing(const std::string& device_id) OVERRIDE;
- virtual void RepeatDiscovery() OVERRIDE;
- virtual std::string GetConfirmationCode() OVERRIDE;
- virtual void SetConfirmationCodeIsCorrect(bool correct) OVERRIDE;
+ virtual void AddObserver(Observer* observer) override;
+ virtual void RemoveObserver(Observer* observer) override;
+ virtual Stage GetCurrentStage() override;
+ virtual void StartPairing() override;
+ virtual DeviceIdList GetDiscoveredDevices() override;
+ virtual void ChooseDeviceForPairing(const std::string& device_id) override;
+ virtual void RepeatDiscovery() override;
+ virtual std::string GetConfirmationCode() override;
+ virtual void SetConfirmationCodeIsCorrect(bool correct) override;
virtual void SetHostConfiguration(
bool accepted_eula,
const std::string& lang,
const std::string& timezone,
bool send_reports,
- const std::string& keyboard_layout) OVERRIDE;
+ const std::string& keyboard_layout) override;
virtual void OnAuthenticationDone(const std::string& domain,
- const std::string& auth_token) OVERRIDE;
- virtual void StartSession() OVERRIDE;
+ const std::string& auth_token) override;
+ virtual void StartSession() override;
private:
void ChangeStage(Stage new_stage);
@@ -91,8 +91,8 @@ class FakeControllerPairingController
void DeviceLost(const std::string& device_id);
// Overridden from ui::ControllerPairingController::Observer:
- virtual void PairingStageChanged(Stage new_stage) OVERRIDE;
- virtual void DiscoveredDevicesListChanged() OVERRIDE;
+ virtual void PairingStageChanged(Stage new_stage) override;
+ virtual void DiscoveredDevicesListChanged() override;
ObserverList<ControllerPairingController::Observer> observers_;
Stage current_stage_;
« 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