1 files changed, 12 insertions, 12 deletions

diff --git a/chromeos/dbus/nfc_device_client.cc b/chromeos/dbus/nfc_device_client.cc
index a1976c8..4b5281b 100644
--- a/chromeos/dbus/nfc_device_client.cc
+++ b/chromeos/dbus/nfc_device_client.cc
@@ -49,20 +49,20 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   }
 
   // NfcDeviceClient override.
-  virtual void AddObserver(NfcDeviceClient::Observer* observer) OVERRIDE {
+  virtual void AddObserver(NfcDeviceClient::Observer* observer) override {
     DCHECK(observer);
     observers_.AddObserver(observer);
   }
 
   // NfcDeviceClient override.
-  virtual void RemoveObserver(NfcDeviceClient::Observer* observer) OVERRIDE {
+  virtual void RemoveObserver(NfcDeviceClient::Observer* observer) override {
     DCHECK(observer);
     observers_.RemoveObserver(observer);
   }
 
   // NfcDeviceClient override.
   virtual std::vector<dbus::ObjectPath> GetDevicesForAdapter(
-      const dbus::ObjectPath& adapter_path) OVERRIDE {
+      const dbus::ObjectPath& adapter_path) override {
     DBusObjectMap* object_map =
         adapters_to_object_maps_.GetObjectMap(adapter_path);
     if (!object_map)
@@ -72,7 +72,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
 
   // NfcDeviceClient override.
   virtual Properties* GetProperties(
-      const dbus::ObjectPath& object_path) OVERRIDE {
+      const dbus::ObjectPath& object_path) override {
     return static_cast<Properties*>(
         adapters_to_object_maps_.FindObjectProperties(object_path));
   }
@@ -82,7 +82,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
       const dbus::ObjectPath& object_path,
       const base::DictionaryValue& attributes,
       const base::Closure& callback,
-      const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE {
+      const nfc_client_helpers::ErrorCallback& error_callback) override {
     dbus::ObjectProxy* object_proxy =
         adapters_to_object_maps_.FindObjectProxy(object_path);
     if (!object_proxy) {
@@ -120,7 +120,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
 
  protected:
   // DBusClient override.
-  virtual void Init(dbus::Bus* bus) OVERRIDE {
+  virtual void Init(dbus::Bus* bus) override {
     VLOG(1) << "Creating NfcDeviceClientImpl";
     DCHECK(bus);
     bus_ = bus;
@@ -130,7 +130,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
 
  private:
   // NfcAdapterClient::Observer override.
-  virtual void AdapterAdded(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void AdapterAdded(const dbus::ObjectPath& object_path) override {
     VLOG(1) << "Adapter added. Creating map for device proxies belonging to "
             << "adapter: " << object_path.value();
     adapters_to_object_maps_.CreateObjectMap(
@@ -138,7 +138,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   }
 
   // NfcAdapterClient::Observer override.
-  virtual void AdapterRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void AdapterRemoved(const dbus::ObjectPath& object_path) override {
     // Neard doesn't send out property changed signals for the devices that
     // are removed when the adapter they belong to is removed. Clean up the
     // object proxies for devices that are managed by the removed adapter.
@@ -152,7 +152,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   // NfcAdapterClient::Observer override.
   virtual void AdapterPropertyChanged(
       const dbus::ObjectPath& object_path,
-      const std::string& property_name) OVERRIDE {
+      const std::string& property_name) override {
     DCHECK(adapter_client_);
     NfcAdapterClient::Properties *adapter_properties =
         adapter_client_->GetProperties(object_path);
@@ -174,7 +174,7 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
   virtual NfcPropertySet* CreateProperties(
-      dbus::ObjectProxy* object_proxy) OVERRIDE {
+      dbus::ObjectProxy* object_proxy) override {
     return new Properties(
         object_proxy,
         base::Bind(&NfcDeviceClientImpl::OnPropertyChanged,
@@ -183,12 +183,12 @@ class NfcDeviceClientImpl : public NfcDeviceClient,
   }
 
   // nfc_client_helpers::DBusObjectMap::Delegate override.
-  virtual void ObjectAdded(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void ObjectAdded(const dbus::ObjectPath& object_path) override {
     FOR_EACH_OBSERVER(NfcDeviceClient::Observer, observers_,
                       DeviceAdded(object_path));
   }
 
-  virtual void ObjectRemoved(const dbus::ObjectPath& object_path) OVERRIDE {
+  virtual void ObjectRemoved(const dbus::ObjectPath& object_path) override {
     FOR_EACH_OBSERVER(NfcDeviceClient::Observer, observers_,
                       DeviceRemoved(object_path));
   }