| Index: chromeos/dbus/fake_nfc_adapter_client.h
|
| diff --git a/chromeos/dbus/fake_nfc_adapter_client.h b/chromeos/dbus/fake_nfc_adapter_client.h
|
| index 0bd353a06fcac59f5ade86ab01cf33f109b83d30..2e4ff998d0cf43cfe6acb5e49a0ddac6ea3d6bc8 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);
|
|
|