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

Unified Diff: chromeos/dbus/bluetooth_gatt_descriptor_client.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (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: chromeos/dbus/bluetooth_gatt_descriptor_client.cc
diff --git a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
index 850b228e756ca9efbaf6457de10898784041f5b4..e0790000dd18c435a69e37036cc74ce060602a11 100644
--- a/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
+++ b/chromeos/dbus/bluetooth_gatt_descriptor_client.cc
@@ -50,20 +50,20 @@ class BluetoothGattDescriptorClientImpl
// BluetoothGattDescriptorClientImpl override.
virtual void AddObserver(
- BluetoothGattDescriptorClient::Observer* observer) OVERRIDE {
+ BluetoothGattDescriptorClient::Observer* observer) override {
DCHECK(observer);
observers_.AddObserver(observer);
}
// BluetoothGattDescriptorClientImpl override.
virtual void RemoveObserver(
- BluetoothGattDescriptorClient::Observer* observer) OVERRIDE {
+ BluetoothGattDescriptorClient::Observer* observer) override {
DCHECK(observer);
observers_.RemoveObserver(observer);
}
// BluetoothGattDescriptorClientImpl override.
- virtual std::vector<dbus::ObjectPath> GetDescriptors() OVERRIDE {
+ virtual std::vector<dbus::ObjectPath> GetDescriptors() override {
DCHECK(object_manager_);
return object_manager_->GetObjectsWithInterface(
bluetooth_gatt_descriptor::kBluetoothGattDescriptorInterface);
@@ -71,7 +71,7 @@ class BluetoothGattDescriptorClientImpl
// BluetoothGattDescriptorClientImpl override.
virtual Properties* GetProperties(
- const dbus::ObjectPath& object_path) OVERRIDE {
+ const dbus::ObjectPath& object_path) override {
DCHECK(object_manager_);
return static_cast<Properties*>(
object_manager_->GetProperties(
@@ -82,7 +82,7 @@ class BluetoothGattDescriptorClientImpl
// BluetoothGattDescriptorClientImpl override.
virtual void ReadValue(const dbus::ObjectPath& object_path,
const ValueCallback& callback,
- const ErrorCallback& error_callback) OVERRIDE {
+ const ErrorCallback& error_callback) override {
dbus::ObjectProxy* object_proxy =
object_manager_->GetObjectProxy(object_path);
if (!object_proxy) {
@@ -109,7 +109,7 @@ class BluetoothGattDescriptorClientImpl
virtual void WriteValue(const dbus::ObjectPath& object_path,
const std::vector<uint8>& value,
const base::Closure& callback,
- const ErrorCallback& error_callback) OVERRIDE {
+ const ErrorCallback& error_callback) override {
dbus::ObjectProxy* object_proxy =
object_manager_->GetObjectProxy(object_path);
if (!object_proxy) {
@@ -138,7 +138,7 @@ class BluetoothGattDescriptorClientImpl
virtual dbus::PropertySet* CreateProperties(
dbus::ObjectProxy *object_proxy,
const dbus::ObjectPath& object_path,
- const std::string& interface_name) OVERRIDE {
+ const std::string& interface_name) override {
Properties* properties = new Properties(
object_proxy,
interface_name,
@@ -150,7 +150,7 @@ class BluetoothGattDescriptorClientImpl
// dbus::ObjectManager::Interface override.
virtual void ObjectAdded(const dbus::ObjectPath& object_path,
- const std::string& interface_name) OVERRIDE {
+ const std::string& interface_name) override {
VLOG(2) << "Remote GATT descriptor added: " << object_path.value();
FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
GattDescriptorAdded(object_path));
@@ -158,7 +158,7 @@ class BluetoothGattDescriptorClientImpl
// dbus::ObjectManager::Interface override.
virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
- const std::string& interface_name) OVERRIDE {
+ const std::string& interface_name) override {
VLOG(2) << "Remote GATT descriptor removed: " << object_path.value();
FOR_EACH_OBSERVER(BluetoothGattDescriptorClient::Observer, observers_,
GattDescriptorRemoved(object_path));
@@ -166,7 +166,7 @@ class BluetoothGattDescriptorClientImpl
protected:
// chromeos::DBusClient override.
- virtual void Init(dbus::Bus* bus) OVERRIDE {
+ virtual void Init(dbus::Bus* bus) override {
object_manager_ = bus->GetObjectManager(
bluetooth_object_manager::kBluetoothObjectManagerServiceName,
dbus::ObjectPath(

Powered by Google App Engine
This is Rietveld 408576698