Skip to content

Commit

Permalink
replace OVERRIDE and FINAL with override and final in device/
Browse files Browse the repository at this point in the history 
BUG=417463

Review URL: https://codereview.chromium.org/628873002

Cr-Commit-Position: refs/heads/master@{#298289}
  • Loading branch information
@mostynb
mostynb authored and Commit bot committed Oct 6, 2014
1 parent dafebe6 commit 53cd3c4
Show file tree
Hide file tree
Showing 71 changed files with 514 additions and 514 deletions.
66 changes: 33 additions & 33 deletions device/bluetooth/bluetooth_adapter_chromeos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,37 +44,37 @@ class BluetoothAdapterChromeOS

// BluetoothAdapter:
virtual void AddObserver(
device::BluetoothAdapter::Observer* observer) OVERRIDE;
device::BluetoothAdapter::Observer* observer) override;
virtual void RemoveObserver(
device::BluetoothAdapter::Observer* observer) OVERRIDE;
virtual std::string GetAddress() const OVERRIDE;
virtual std::string GetName() const OVERRIDE;
device::BluetoothAdapter::Observer* observer) override;
virtual std::string GetAddress() const override;
virtual std::string GetName() const override;
virtual void SetName(const std::string& name,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsInitialized() const OVERRIDE;
virtual bool IsPresent() const OVERRIDE;
virtual bool IsPowered() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsInitialized() const override;
virtual bool IsPresent() const override;
virtual bool IsPowered() const override;
virtual void SetPowered(
bool powered,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsDiscoverable() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsDiscoverable() const override;
virtual void SetDiscoverable(
bool discoverable,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsDiscovering() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsDiscovering() const override;
virtual void CreateRfcommService(
const device::BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE;
const CreateServiceErrorCallback& error_callback) override;
virtual void CreateL2capService(
const device::BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE;
const CreateServiceErrorCallback& error_callback) override;

// Locates the device object by object path (the devices map and
// BluetoothDevice methods are by address).
Expand Down Expand Up @@ -112,7 +112,7 @@ class BluetoothAdapterChromeOS
protected:
// BluetoothAdapter:
virtual void RemovePairingDelegateInternal(
device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE;
device::BluetoothDevice::PairingDelegate* pairing_delegate) override;

private:
friend class BluetoothChromeOSTest;
Expand All @@ -127,43 +127,43 @@ class BluetoothAdapterChromeOS
virtual ~BluetoothAdapterChromeOS();

// BluetoothAdapterClient::Observer override.
virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE;
virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
virtual void AdapterAdded(const dbus::ObjectPath& object_path) override;
virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override;
virtual void AdapterPropertyChanged(
const dbus::ObjectPath& object_path,
const std::string& property_name) OVERRIDE;
const std::string& property_name) override;

// BluetoothDeviceClient::Observer override.
virtual void DeviceAdded(const dbus::ObjectPath& object_path) OVERRIDE;
virtual void DeviceRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
virtual void DeviceAdded(const dbus::ObjectPath& object_path) override;
virtual void DeviceRemoved(const dbus::ObjectPath& object_path) override;
virtual void DevicePropertyChanged(const dbus::ObjectPath& object_path,
const std::string& property_name) OVERRIDE;
const std::string& property_name) override;

// BluetoothInputClient::Observer override.
virtual void InputPropertyChanged(const dbus::ObjectPath& object_path,
const std::string& property_name) OVERRIDE;
const std::string& property_name) override;

// BluetoothAgentServiceProvider::Delegate override.
virtual void Released() OVERRIDE;
virtual void Released() override;
virtual void RequestPinCode(const dbus::ObjectPath& device_path,
const PinCodeCallback& callback) OVERRIDE;
const PinCodeCallback& callback) override;
virtual void DisplayPinCode(const dbus::ObjectPath& device_path,
const std::string& pincode) OVERRIDE;
const std::string& pincode) override;
virtual void RequestPasskey(const dbus::ObjectPath& device_path,
const PasskeyCallback& callback) OVERRIDE;
const PasskeyCallback& callback) override;
virtual void DisplayPasskey(const dbus::ObjectPath& device_path,
uint32 passkey, uint16 entered) OVERRIDE;
uint32 passkey, uint16 entered) override;
virtual void RequestConfirmation(const dbus::ObjectPath& device_path,
uint32 passkey,
const ConfirmationCallback& callback)
OVERRIDE;
override;
virtual void RequestAuthorization(const dbus::ObjectPath& device_path,
const ConfirmationCallback& callback)
OVERRIDE;
override;
virtual void AuthorizeService(const dbus::ObjectPath& device_path,
const std::string& uuid,
const ConfirmationCallback& callback) OVERRIDE;
virtual void Cancel() OVERRIDE;
const ConfirmationCallback& callback) override;
virtual void Cancel() override;

// Called by dbus:: on completion of the D-Bus method call to register the
// pairing agent.
Expand Down Expand Up @@ -214,10 +214,10 @@ class BluetoothAdapterChromeOS
// BluetoothAdapter:
virtual void AddDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
const ErrorCallback& error_callback) override;
virtual void RemoveDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
const ErrorCallback& error_callback) override;

// Called by dbus:: on completion of the D-Bus method call to start discovery.
void OnStartDiscovery(const base::Closure& callback);
Expand Down
38 changes: 19 additions & 19 deletions device/bluetooth/bluetooth_adapter_mac.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,48 +38,48 @@ class BluetoothAdapterMac : public BluetoothAdapter,
static base::WeakPtr<BluetoothAdapter> CreateAdapter();

// BluetoothAdapter:
virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
virtual std::string GetAddress() const OVERRIDE;
virtual std::string GetName() const OVERRIDE;
virtual void AddObserver(BluetoothAdapter::Observer* observer) override;
virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override;
virtual std::string GetAddress() const override;
virtual std::string GetName() const override;
virtual void SetName(const std::string& name,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsInitialized() const OVERRIDE;
virtual bool IsPresent() const OVERRIDE;
virtual bool IsPowered() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsInitialized() const override;
virtual bool IsPresent() const override;
virtual bool IsPowered() const override;
virtual void SetPowered(
bool powered,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsDiscoverable() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsDiscoverable() const override;
virtual void SetDiscoverable(
bool discoverable,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
virtual bool IsDiscovering() const OVERRIDE;
const ErrorCallback& error_callback) override;
virtual bool IsDiscovering() const override;
virtual void CreateRfcommService(
const BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE;
const CreateServiceErrorCallback& error_callback) override;
virtual void CreateL2capService(
const BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE;
const CreateServiceErrorCallback& error_callback) override;

// BluetoothDiscoveryManagerMac::Observer overrides
virtual void DeviceFound(IOBluetoothDevice* device) OVERRIDE;
virtual void DiscoveryStopped(bool unexpected) OVERRIDE;
virtual void DeviceFound(IOBluetoothDevice* device) override;
virtual void DiscoveryStopped(bool unexpected) override;

// Registers that a new |device| has connected to the local host.
void DeviceConnected(IOBluetoothDevice* device);

protected:
// BluetoothAdapter:
virtual void RemovePairingDelegateInternal(
device::BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE;
device::BluetoothDevice::PairingDelegate* pairing_delegate) override;

private:
friend class BluetoothAdapterMacTest;
Expand All @@ -90,10 +90,10 @@ class BluetoothAdapterMac : public BluetoothAdapter,
// BluetoothAdapter:
virtual void AddDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
const ErrorCallback& error_callback) override;
virtual void RemoveDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
const ErrorCallback& error_callback) override;

void Init();
void InitForTest(scoped_refptr<base::SequencedTaskRunner> ui_task_runner);
Expand Down
50 changes: 25 additions & 25 deletions device/bluetooth/bluetooth_adapter_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,108 +17,108 @@ class TestBluetoothAdapter : public BluetoothAdapter {
TestBluetoothAdapter() {
}

virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE {
virtual void AddObserver(BluetoothAdapter::Observer* observer) override {
}

virtual void RemoveObserver(BluetoothAdapter::Observer* observer) OVERRIDE {
virtual void RemoveObserver(BluetoothAdapter::Observer* observer) override {

}

virtual std::string GetAddress() const OVERRIDE {
virtual std::string GetAddress() const override {
return "";
}

virtual std::string GetName() const OVERRIDE {
virtual std::string GetName() const override {
return "";
}

virtual void SetName(const std::string& name,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual bool IsInitialized() const OVERRIDE {
virtual bool IsInitialized() const override {
return false;
}

virtual bool IsPresent() const OVERRIDE {
virtual bool IsPresent() const override {
return false;
}

virtual bool IsPowered() const OVERRIDE {
virtual bool IsPowered() const override {
return false;
}

virtual void SetPowered(
bool powered,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual bool IsDiscoverable() const OVERRIDE {
virtual bool IsDiscoverable() const override {
return false;
}

virtual void SetDiscoverable(
bool discoverable,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual bool IsDiscovering() const OVERRIDE {
virtual bool IsDiscovering() const override {
return false;
}

virtual void StartDiscoverySession(
const DiscoverySessionCallback& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual void CreateRfcommService(
const BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE {
const CreateServiceErrorCallback& error_callback) override {
}

virtual void CreateL2capService(
const BluetoothUUID& uuid,
const ServiceOptions& options,
const CreateServiceCallback& callback,
const CreateServiceErrorCallback& error_callback) OVERRIDE {
const CreateServiceErrorCallback& error_callback) override {
}

protected:
virtual ~TestBluetoothAdapter() {}

virtual void AddDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual void RemoveDiscoverySession(
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE {
const ErrorCallback& error_callback) override {
}

virtual void RemovePairingDelegateInternal(
BluetoothDevice::PairingDelegate* pairing_delegate) OVERRIDE {
BluetoothDevice::PairingDelegate* pairing_delegate) override {
}
};

class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
public:
virtual void RequestPinCode(BluetoothDevice* device) OVERRIDE {}
virtual void RequestPasskey(BluetoothDevice* device) OVERRIDE {}
virtual void RequestPinCode(BluetoothDevice* device) override {}
virtual void RequestPasskey(BluetoothDevice* device) override {}
virtual void DisplayPinCode(BluetoothDevice* device,
const std::string& pincode) OVERRIDE {}
const std::string& pincode) override {}
virtual void DisplayPasskey(BluetoothDevice* device,
uint32 passkey) OVERRIDE {}
uint32 passkey) override {}
virtual void KeysEntered(BluetoothDevice* device,
uint32 entered) OVERRIDE {}
uint32 entered) override {}
virtual void ConfirmPasskey(BluetoothDevice* device,
uint32 passkey) OVERRIDE {}
virtual void AuthorizePairing(BluetoothDevice* device) OVERRIDE {}
uint32 passkey) override {}
virtual void AuthorizePairing(BluetoothDevice* device) override {}
};


Expand Down
Loading

0 comments on commit 53cd3c4

Please sign in to comment.