summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/fake_nfc_adapter_client.h
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-06 06:57:52 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-06 13:58:09 +0000
commit4f4cf14943aba9f3ea42f631f9eb491ce0c87857 (patch)
tree1618fda16904edf449107e4088b7eb7316538816 /chromeos/dbus/fake_nfc_adapter_client.h
parent71fc3adc68bb1feb651b7f38cd0a4eb777186de9 (diff)
downloadchromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.zip
chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.gz
chromium_src-4f4cf14943aba9f3ea42f631f9eb491ce0c87857.tar.bz2
replace OVERRIDE and FINAL with override and final in chromeos/
BUG=417463 Review URL: https://codereview.chromium.org/628883002 Cr-Commit-Position: refs/heads/master@{#298229}
Diffstat (limited to 'chromeos/dbus/fake_nfc_adapter_client.h')
-rw-r--r--chromeos/dbus/fake_nfc_adapter_client.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/chromeos/dbus/fake_nfc_adapter_client.h b/chromeos/dbus/fake_nfc_adapter_client.h
index 0bd353a..2e4ff99 100644
--- a/chromeos/dbus/fake_nfc_adapter_client.h
+++ b/chromeos/dbus/fake_nfc_adapter_client.h
@@ -30,31 +30,31 @@ class CHROMEOS_EXPORT FakeNfcAdapterClient : public NfcAdapterClient {
// dbus::PropertySet overrides.
virtual void Get(dbus::PropertyBase* property,
- dbus::PropertySet::GetCallback callback) OVERRIDE;
- virtual void GetAll() OVERRIDE;
+ dbus::PropertySet::GetCallback callback) override;
+ virtual void GetAll() override;
virtual void Set(dbus::PropertyBase* property,
- dbus::PropertySet::SetCallback callback) OVERRIDE;
+ dbus::PropertySet::SetCallback callback) override;
};
FakeNfcAdapterClient();
virtual ~FakeNfcAdapterClient();
// NfcAdapterClient overrides.
- virtual void Init(dbus::Bus* bus) OVERRIDE;
- virtual void AddObserver(Observer* observer) OVERRIDE;
- virtual void RemoveObserver(Observer* observer) OVERRIDE;
- virtual std::vector<dbus::ObjectPath> GetAdapters() OVERRIDE;
+ virtual void Init(dbus::Bus* bus) override;
+ virtual void AddObserver(Observer* observer) override;
+ virtual void RemoveObserver(Observer* observer) override;
+ virtual std::vector<dbus::ObjectPath> GetAdapters() override;
virtual Properties* GetProperties(
- const dbus::ObjectPath& object_path) OVERRIDE;
+ const dbus::ObjectPath& object_path) override;
virtual void StartPollLoop(
const dbus::ObjectPath& object_path,
const std::string& mode,
const base::Closure& callback,
- const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE;
+ const nfc_client_helpers::ErrorCallback& error_callback) override;
virtual void StopPollLoop(
const dbus::ObjectPath& object_path,
const base::Closure& callback,
- const nfc_client_helpers::ErrorCallback& error_callback) OVERRIDE;
+ const nfc_client_helpers::ErrorCallback& error_callback) override;
// Sets the adapter as |present|. Used for testing.
void SetAdapterPresent(bool present);