replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/dbus/bluetooth_device_client.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/bluetooth_device_client.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "dbus/bus.h"
@@ skipping 48 matching lines @@
   BluetoothDeviceClientImpl()
       : object_manager_(NULL), weak_ptr_factory_(this) {}
 
   virtual ~BluetoothDeviceClientImpl() {
     object_manager_->UnregisterInterface(
         bluetooth_device::kBluetoothDeviceInterface);
   }
 
   // BluetoothDeviceClient override.
   virtual void AddObserver(BluetoothDeviceClient::Observer* observer)
-      OVERRIDE {
+      override {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // BluetoothDeviceClient override.
   virtual void RemoveObserver(BluetoothDeviceClient::Observer* observer)
-      OVERRIDE {
+      override {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   // dbus::ObjectManager::Interface override.
   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,
         base::Bind(&BluetoothDeviceClientImpl::OnPropertyChanged,
                    weak_ptr_factory_.GetWeakPtr(),
                    object_path));
     return static_cast<dbus::PropertySet*>(properties);
   }
 
   // BluetoothDeviceClient override.
   virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter(
-      const dbus::ObjectPath& adapter_path) OVERRIDE {
+      const dbus::ObjectPath& adapter_path) override {
     std::vector<dbus::ObjectPath> object_paths, device_paths;
     device_paths = object_manager_->GetObjectsWithInterface(
         bluetooth_device::kBluetoothDeviceInterface);
     for (std::vector<dbus::ObjectPath>::iterator iter = device_paths.begin();
          iter != device_paths.end(); ++iter) {
       Properties* properties = GetProperties(*iter);
       if (properties->adapter.value() == adapter_path)
         object_paths.push_back(*iter);
     }
     return object_paths;
   }
 
   // BluetoothDeviceClient override.
   virtual Properties* GetProperties(const dbus::ObjectPath& object_path)
-      OVERRIDE {
+      override {
     return static_cast<Properties*>(
         object_manager_->GetProperties(
             object_path,
             bluetooth_device::kBluetoothDeviceInterface));
   }
 
   // BluetoothDeviceClient override.
   virtual void Connect(const dbus::ObjectPath& object_path,
                        const base::Closure& callback,
-                       const ErrorCallback& error_callback) OVERRIDE {
+                       const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kConnect);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
 
     // Connect may take an arbitrary length of time, so use no timeout.
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void Disconnect(const dbus::ObjectPath& object_path,
                           const base::Closure& callback,
-                          const ErrorCallback& error_callback) OVERRIDE {
+                          const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kDisconnect);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void ConnectProfile(const dbus::ObjectPath& object_path,
                               const std::string& uuid,
                               const base::Closure& callback,
-                              const ErrorCallback& error_callback) OVERRIDE {
+                              const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kConnectProfile);
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(uuid);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
 
     // Connect may take an arbitrary length of time, so use no timeout.
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void DisconnectProfile(const dbus::ObjectPath& object_path,
                                  const std::string& uuid,
                                  const base::Closure& callback,
                                  const ErrorCallback& error_callback)
-        OVERRIDE {
+        override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kDisconnectProfile);
 
     dbus::MessageWriter writer(&method_call);
     writer.AppendString(uuid);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
 
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void Pair(const dbus::ObjectPath& object_path,
                     const base::Closure& callback,
-                    const ErrorCallback& error_callback) OVERRIDE {
+                    const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kPair);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
 
     // Pairing may take an arbitrary length of time, so use no timeout.
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_INFINITE,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void CancelPairing(const dbus::ObjectPath& object_path,
                              const base::Closure& callback,
                              const ErrorCallback& error_callback)
-        OVERRIDE {
+        override {
     dbus::MethodCall method_call(
         bluetooth_device::kBluetoothDeviceInterface,
         bluetooth_device::kCancelPairing);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(), callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(), error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void StartConnectionMonitor(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface,
                                  bluetooth_device::kStartConnectionMonitor);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
   // BluetoothDeviceClient override.
   virtual void StopConnectionMonitor(
       const dbus::ObjectPath& object_path,
       const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE {
+      const ErrorCallback& error_callback) override {
     dbus::MethodCall method_call(bluetooth_device::kBluetoothDeviceInterface,
                                  bluetooth_device::kStopConnectionMonitor);
 
     dbus::ObjectProxy* object_proxy =
         object_manager_->GetObjectProxy(object_path);
     if (!object_proxy) {
       error_callback.Run(kUnknownDeviceError, "");
       return;
     }
     object_proxy->CallMethodWithErrorCallback(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&BluetoothDeviceClientImpl::OnSuccess,
                    weak_ptr_factory_.GetWeakPtr(),
                    callback),
         base::Bind(&BluetoothDeviceClientImpl::OnError,
                    weak_ptr_factory_.GetWeakPtr(),
                    error_callback));
   }
 
  protected:
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     object_manager_ = bus->GetObjectManager(
         bluetooth_object_manager::kBluetoothObjectManagerServiceName,
         dbus::ObjectPath(
             bluetooth_object_manager::kBluetoothObjectManagerServicePath));
     object_manager_->RegisterInterface(
         bluetooth_device::kBluetoothDeviceInterface, this);
   }
 
  private:
   // Called by dbus::ObjectManager when an object with the device interface
   // is created. Informs observers.
   virtual void ObjectAdded(const dbus::ObjectPath& object_path,
-                           const std::string& interface_name) OVERRIDE {
+                           const std::string& interface_name) override {
     FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                       DeviceAdded(object_path));
   }
 
   // Called by dbus::ObjectManager when an object with the device interface
   // is removed. Informs observers.
   virtual void ObjectRemoved(const dbus::ObjectPath& object_path,
-                             const std::string& interface_name) OVERRIDE {
+                             const std::string& interface_name) override {
     FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
                       DeviceRemoved(object_path));
   }
 
   // Called by BluetoothPropertySet when a property value is changed,
   // either by result of a signal or response to a GetAll() or Get()
   // call. Informs observers.
   void OnPropertyChanged(const dbus::ObjectPath& object_path,
                          const std::string& property_name) {
     FOR_EACH_OBSERVER(BluetoothDeviceClient::Observer, observers_,
@@ skipping 42 matching lines @@
 }
 
 BluetoothDeviceClient::~BluetoothDeviceClient() {
 }
 
 BluetoothDeviceClient* BluetoothDeviceClient::Create() {
   return new BluetoothDeviceClientImpl();
 }
 
 }  // namespace chromeos