| Index: device/nfc/nfc_peer_chromeos.h
|
| diff --git a/device/nfc/nfc_peer_chromeos.h b/device/nfc/nfc_peer_chromeos.h
|
| index eec8e4bce2a6b66ef3c86170d1898105fa78cb16..c4d8c585408837b5dd3d0d1c66421e8751fe777b 100644
|
| --- a/device/nfc/nfc_peer_chromeos.h
|
| +++ b/device/nfc/nfc_peer_chromeos.h
|
| @@ -21,16 +21,16 @@ class NfcPeerChromeOS : public device::NfcPeer,
|
| public NfcRecordClient::Observer {
|
| public:
|
| // NfcPeer overrides.
|
| - virtual void AddObserver(device::NfcPeer::Observer* observer) OVERRIDE;
|
| - virtual void RemoveObserver(device::NfcPeer::Observer* observer) OVERRIDE;
|
| - virtual std::string GetIdentifier() const OVERRIDE;
|
| - virtual const device::NfcNdefMessage& GetNdefMessage() const OVERRIDE;
|
| + virtual void AddObserver(device::NfcPeer::Observer* observer) override;
|
| + virtual void RemoveObserver(device::NfcPeer::Observer* observer) override;
|
| + virtual std::string GetIdentifier() const override;
|
| + virtual const device::NfcNdefMessage& GetNdefMessage() const override;
|
| virtual void PushNdef(const device::NfcNdefMessage& message,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
| virtual void StartHandover(HandoverType handover_type,
|
| const base::Closure& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE;
|
| + const ErrorCallback& error_callback) override;
|
|
|
| private:
|
| friend class NfcAdapterChromeOS;
|
| @@ -42,10 +42,10 @@ class NfcPeerChromeOS : public device::NfcPeer,
|
| virtual ~NfcPeerChromeOS();
|
|
|
| // NfcRecordClient::Observer overrides.
|
| - virtual void RecordAdded(const dbus::ObjectPath& object_path) OVERRIDE;
|
| - virtual void RecordRemoved(const dbus::ObjectPath& object_path) OVERRIDE;
|
| + virtual void RecordAdded(const dbus::ObjectPath& object_path) override;
|
| + virtual void RecordRemoved(const dbus::ObjectPath& object_path) override;
|
| virtual void RecordPropertiesReceived(
|
| - const dbus::ObjectPath& object_path) OVERRIDE;
|
| + const dbus::ObjectPath& object_path) override;
|
|
|
| // Called by dbus:: on completion of the D-Bus method call to push an NDEF.
|
| void OnPushNdef(const base::Closure& callback);
|
|
|