| Index: device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
|
| diff --git a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
|
| index 5639169060180afc8de56657ffd83fb30188529d..52ce9bd6ba4ec95eace783cd72c0f2a17f4127aa 100644
|
| --- a/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
|
| +++ b/device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc
|
| @@ -37,7 +37,7 @@ class MediaTransferProtocolDaemonClientImpl
|
|
|
| // MediaTransferProtocolDaemonClient override.
|
| virtual void EnumerateStorages(const EnumerateStoragesCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface,
|
| mtpd::kEnumerateStorages);
|
| proxy_->CallMethod(
|
| @@ -51,7 +51,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| // MediaTransferProtocolDaemonClient override.
|
| virtual void GetStorageInfo(const std::string& storage_name,
|
| const GetStorageInfoCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetStorageInfo);
|
| dbus::MessageWriter writer(&method_call);
|
| writer.AppendString(storage_name);
|
| @@ -68,7 +68,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| virtual void OpenStorage(const std::string& storage_name,
|
| const std::string& mode,
|
| const OpenStorageCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kOpenStorage);
|
| dbus::MessageWriter writer(&method_call);
|
| writer.AppendString(storage_name);
|
| @@ -85,7 +85,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| // MediaTransferProtocolDaemonClient override.
|
| virtual void CloseStorage(const std::string& handle,
|
| const CloseStorageCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kCloseStorage);
|
| dbus::MessageWriter writer(&method_call);
|
| writer.AppendString(handle);
|
| @@ -102,7 +102,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| const std::string& handle,
|
| uint32 file_id,
|
| const ReadDirectoryEntryIdsCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface,
|
| mtpd::kReadDirectoryEntryIds);
|
| dbus::MessageWriter writer(&method_call);
|
| @@ -121,7 +121,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| size_t offset,
|
| size_t entries_to_read,
|
| const GetFileInfoCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| if (offset >= file_ids.size()) {
|
| error_callback.Run();
|
| return;
|
| @@ -156,7 +156,7 @@ class MediaTransferProtocolDaemonClientImpl
|
| uint32 offset,
|
| uint32 bytes_to_read,
|
| const ReadFileCallback& callback,
|
| - const ErrorCallback& error_callback) OVERRIDE {
|
| + const ErrorCallback& error_callback) override {
|
| DCHECK_LE(bytes_to_read, kMaxChunkSize);
|
| dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadFileChunk);
|
| dbus::MessageWriter writer(&method_call);
|
| @@ -174,7 +174,7 @@ class MediaTransferProtocolDaemonClientImpl
|
|
|
| // MediaTransferProtocolDaemonClient override.
|
| virtual void ListenForChanges(
|
| - const MTPStorageEventHandler& handler) OVERRIDE {
|
| + const MTPStorageEventHandler& handler) override {
|
| DCHECK(!listen_for_changes_called_);
|
| listen_for_changes_called_ = true;
|
|
|
|
|