ash/system/chromeos/bluetooth/bluetooth_notification_controller.h - Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash.

Unified Diff: ash/system/chromeos/bluetooth/bluetooth_notification_controller.h

Issue 800983006: Update {virtual,override,final} to follow C++11 style in ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Workaround Created 5 years, 11 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

« no previous file with comments | « ash/system/chromeos/audio/tray_audio_delegate_chromeos.h ('k') | ash/system/chromeos/bluetooth/bluetooth_notification_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/system/chromeos/bluetooth/bluetooth_notification_controller.h

diff --git a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h

index bc3c19fddc0b6868c132263e077b9ce550aa8bc9..22b990d3f39c3cbd17a5c2db308918c39466faad 100644

--- a/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h

+++ b/ash/system/chromeos/bluetooth/bluetooth_notification_controller.h

@@ -27,30 +27,27 @@ class ASH_EXPORT BluetoothNotificationController

public device::BluetoothDevice::PairingDelegate {

public:

BluetoothNotificationController();

- virtual ~BluetoothNotificationController();

+ ~BluetoothNotificationController() override;

// device::BluetoothAdapter::Observer override.

- virtual void AdapterDiscoverableChanged(device::BluetoothAdapter* adapter,

- bool discoverable) override;

- virtual void DeviceAdded(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) override;

- virtual void DeviceChanged(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) override;

- virtual void DeviceRemoved(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) override;

+ void AdapterDiscoverableChanged(device::BluetoothAdapter* adapter,

+ bool discoverable) override;

+ void DeviceAdded(device::BluetoothAdapter* adapter,

+ device::BluetoothDevice* device) override;

+ void DeviceChanged(device::BluetoothAdapter* adapter,

+ device::BluetoothDevice* device) override;

+ void DeviceRemoved(device::BluetoothAdapter* adapter,

+ device::BluetoothDevice* device) override;

// device::BluetoothDevice::PairingDelegate override.

- virtual void RequestPinCode(device::BluetoothDevice* device) override;

- virtual void RequestPasskey(device::BluetoothDevice* device) override;

- virtual void DisplayPinCode(device::BluetoothDevice* device,

- const std::string& pincode) override;

- virtual void DisplayPasskey(device::BluetoothDevice* device,

- uint32 passkey) override;

- virtual void KeysEntered(device::BluetoothDevice* device,

- uint32 entered) override;

- virtual void ConfirmPasskey(device::BluetoothDevice* device,

- uint32 passkey) override;

- virtual void AuthorizePairing(device::BluetoothDevice* device) override;

+ void RequestPinCode(device::BluetoothDevice* device) override;

+ void RequestPasskey(device::BluetoothDevice* device) override;

+ void DisplayPinCode(device::BluetoothDevice* device,

+ const std::string& pincode) override;

+ void DisplayPasskey(device::BluetoothDevice* device, uint32 passkey) override;

+ void KeysEntered(device::BluetoothDevice* device, uint32 entered) override;

+ void ConfirmPasskey(device::BluetoothDevice* device, uint32 passkey) override;

+ void AuthorizePairing(device::BluetoothDevice* device) override;

private:

// Internal method called by BluetoothAdapterFactory to provide the adapter