ash/system/chromeos/bluetooth/bluetooth_notification_controller.h - Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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

« 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 e44b28110e7c507ca7e9471d03faff24c8fa0389..bc3c19fddc0b6868c132263e077b9ce550aa8bc9 100644

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

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

@@ -31,26 +31,26 @@ class ASH_EXPORT BluetoothNotificationController

// device::BluetoothAdapter::Observer override.

virtual void AdapterDiscoverableChanged(device::BluetoothAdapter* adapter,

- bool discoverable) OVERRIDE;

+ bool discoverable) override;

virtual void DeviceAdded(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) OVERRIDE;

+ device::BluetoothDevice* device) override;

virtual void DeviceChanged(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) OVERRIDE;

+ device::BluetoothDevice* device) override;

virtual void DeviceRemoved(device::BluetoothAdapter* adapter,

- device::BluetoothDevice* device) OVERRIDE;

+ device::BluetoothDevice* device) override;

// device::BluetoothDevice::PairingDelegate override.

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

- virtual void RequestPasskey(device::BluetoothDevice* device) 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;

+ const std::string& pincode) override;

virtual void DisplayPasskey(device::BluetoothDevice* device,

- uint32 passkey) OVERRIDE;

+ uint32 passkey) override;

virtual void KeysEntered(device::BluetoothDevice* device,

- uint32 entered) OVERRIDE;

+ uint32 entered) override;

virtual void ConfirmPasskey(device::BluetoothDevice* device,

- uint32 passkey) OVERRIDE;

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

+ uint32 passkey) override;

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

private:

// Internal method called by BluetoothAdapterFactory to provide the adapter