Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(671)

Side by Side Diff: device/media_transfer_protocol/media_transfer_protocol_daemon_client.cc

Issue 628873002: replace OVERRIDE and FINAL with override and final in device/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h " 5 #include "device/media_transfer_protocol/media_transfer_protocol_daemon_client.h "
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 19 matching lines...) Expand all
30 explicit MediaTransferProtocolDaemonClientImpl(dbus::Bus* bus) 30 explicit MediaTransferProtocolDaemonClientImpl(dbus::Bus* bus)
31 : proxy_(bus->GetObjectProxy( 31 : proxy_(bus->GetObjectProxy(
32 mtpd::kMtpdServiceName, 32 mtpd::kMtpdServiceName,
33 dbus::ObjectPath(mtpd::kMtpdServicePath))), 33 dbus::ObjectPath(mtpd::kMtpdServicePath))),
34 listen_for_changes_called_(false), 34 listen_for_changes_called_(false),
35 weak_ptr_factory_(this) { 35 weak_ptr_factory_(this) {
36 } 36 }
37 37
38 // MediaTransferProtocolDaemonClient override. 38 // MediaTransferProtocolDaemonClient override.
39 virtual void EnumerateStorages(const EnumerateStoragesCallback& callback, 39 virtual void EnumerateStorages(const EnumerateStoragesCallback& callback,
40 const ErrorCallback& error_callback) OVERRIDE { 40 const ErrorCallback& error_callback) override {
41 dbus::MethodCall method_call(mtpd::kMtpdInterface, 41 dbus::MethodCall method_call(mtpd::kMtpdInterface,
42 mtpd::kEnumerateStorages); 42 mtpd::kEnumerateStorages);
43 proxy_->CallMethod( 43 proxy_->CallMethod(
44 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 44 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
45 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnEnumerateStorages, 45 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnEnumerateStorages,
46 weak_ptr_factory_.GetWeakPtr(), 46 weak_ptr_factory_.GetWeakPtr(),
47 callback, 47 callback,
48 error_callback)); 48 error_callback));
49 } 49 }
50 50
51 // MediaTransferProtocolDaemonClient override. 51 // MediaTransferProtocolDaemonClient override.
52 virtual void GetStorageInfo(const std::string& storage_name, 52 virtual void GetStorageInfo(const std::string& storage_name,
53 const GetStorageInfoCallback& callback, 53 const GetStorageInfoCallback& callback,
54 const ErrorCallback& error_callback) OVERRIDE { 54 const ErrorCallback& error_callback) override {
55 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetStorageInfo); 55 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetStorageInfo);
56 dbus::MessageWriter writer(&method_call); 56 dbus::MessageWriter writer(&method_call);
57 writer.AppendString(storage_name); 57 writer.AppendString(storage_name);
58 proxy_->CallMethod( 58 proxy_->CallMethod(
59 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 59 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
60 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnGetStorageInfo, 60 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnGetStorageInfo,
61 weak_ptr_factory_.GetWeakPtr(), 61 weak_ptr_factory_.GetWeakPtr(),
62 storage_name, 62 storage_name,
63 callback, 63 callback,
64 error_callback)); 64 error_callback));
65 } 65 }
66 66
67 // MediaTransferProtocolDaemonClient override. 67 // MediaTransferProtocolDaemonClient override.
68 virtual void OpenStorage(const std::string& storage_name, 68 virtual void OpenStorage(const std::string& storage_name,
69 const std::string& mode, 69 const std::string& mode,
70 const OpenStorageCallback& callback, 70 const OpenStorageCallback& callback,
71 const ErrorCallback& error_callback) OVERRIDE { 71 const ErrorCallback& error_callback) override {
72 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kOpenStorage); 72 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kOpenStorage);
73 dbus::MessageWriter writer(&method_call); 73 dbus::MessageWriter writer(&method_call);
74 writer.AppendString(storage_name); 74 writer.AppendString(storage_name);
75 DCHECK_EQ(mtpd::kReadOnlyMode, mode); 75 DCHECK_EQ(mtpd::kReadOnlyMode, mode);
76 writer.AppendString(mtpd::kReadOnlyMode); 76 writer.AppendString(mtpd::kReadOnlyMode);
77 proxy_->CallMethod( 77 proxy_->CallMethod(
78 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 78 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
79 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnOpenStorage, 79 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnOpenStorage,
80 weak_ptr_factory_.GetWeakPtr(), 80 weak_ptr_factory_.GetWeakPtr(),
81 callback, 81 callback,
82 error_callback)); 82 error_callback));
83 } 83 }
84 84
85 // MediaTransferProtocolDaemonClient override. 85 // MediaTransferProtocolDaemonClient override.
86 virtual void CloseStorage(const std::string& handle, 86 virtual void CloseStorage(const std::string& handle,
87 const CloseStorageCallback& callback, 87 const CloseStorageCallback& callback,
88 const ErrorCallback& error_callback) OVERRIDE { 88 const ErrorCallback& error_callback) override {
89 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kCloseStorage); 89 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kCloseStorage);
90 dbus::MessageWriter writer(&method_call); 90 dbus::MessageWriter writer(&method_call);
91 writer.AppendString(handle); 91 writer.AppendString(handle);
92 proxy_->CallMethod( 92 proxy_->CallMethod(
93 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 93 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
94 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnCloseStorage, 94 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnCloseStorage,
95 weak_ptr_factory_.GetWeakPtr(), 95 weak_ptr_factory_.GetWeakPtr(),
96 callback, 96 callback,
97 error_callback)); 97 error_callback));
98 } 98 }
99 99
100 // MediaTransferProtocolDaemonClient override. 100 // MediaTransferProtocolDaemonClient override.
101 virtual void ReadDirectoryEntryIds( 101 virtual void ReadDirectoryEntryIds(
102 const std::string& handle, 102 const std::string& handle,
103 uint32 file_id, 103 uint32 file_id,
104 const ReadDirectoryEntryIdsCallback& callback, 104 const ReadDirectoryEntryIdsCallback& callback,
105 const ErrorCallback& error_callback) OVERRIDE { 105 const ErrorCallback& error_callback) override {
106 dbus::MethodCall method_call(mtpd::kMtpdInterface, 106 dbus::MethodCall method_call(mtpd::kMtpdInterface,
107 mtpd::kReadDirectoryEntryIds); 107 mtpd::kReadDirectoryEntryIds);
108 dbus::MessageWriter writer(&method_call); 108 dbus::MessageWriter writer(&method_call);
109 writer.AppendString(handle); 109 writer.AppendString(handle);
110 writer.AppendUint32(file_id); 110 writer.AppendUint32(file_id);
111 proxy_->CallMethod( 111 proxy_->CallMethod(
112 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 112 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
113 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnReadDirectoryIds, 113 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnReadDirectoryIds,
114 weak_ptr_factory_.GetWeakPtr(), 114 weak_ptr_factory_.GetWeakPtr(),
115 callback, 115 callback,
116 error_callback)); 116 error_callback));
117 } 117 }
118 118
119 virtual void GetFileInfo(const std::string& handle, 119 virtual void GetFileInfo(const std::string& handle,
120 const std::vector<uint32>& file_ids, 120 const std::vector<uint32>& file_ids,
121 size_t offset, 121 size_t offset,
122 size_t entries_to_read, 122 size_t entries_to_read,
123 const GetFileInfoCallback& callback, 123 const GetFileInfoCallback& callback,
124 const ErrorCallback& error_callback) OVERRIDE { 124 const ErrorCallback& error_callback) override {
125 if (offset >= file_ids.size()) { 125 if (offset >= file_ids.size()) {
126 error_callback.Run(); 126 error_callback.Run();
127 return; 127 return;
128 } 128 }
129 129
130 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetFileInfo); 130 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kGetFileInfo);
131 dbus::MessageWriter writer(&method_call); 131 dbus::MessageWriter writer(&method_call);
132 writer.AppendString(handle); 132 writer.AppendString(handle);
133 { 133 {
134 dbus::MessageWriter array_writer(NULL); 134 dbus::MessageWriter array_writer(NULL);
(...skipping 14 matching lines...) Expand all
149 callback, 149 callback,
150 error_callback)); 150 error_callback));
151 } 151 }
152 152
153 // MediaTransferProtocolDaemonClient override. 153 // MediaTransferProtocolDaemonClient override.
154 virtual void ReadFileChunk(const std::string& handle, 154 virtual void ReadFileChunk(const std::string& handle,
155 uint32 file_id, 155 uint32 file_id,
156 uint32 offset, 156 uint32 offset,
157 uint32 bytes_to_read, 157 uint32 bytes_to_read,
158 const ReadFileCallback& callback, 158 const ReadFileCallback& callback,
159 const ErrorCallback& error_callback) OVERRIDE { 159 const ErrorCallback& error_callback) override {
160 DCHECK_LE(bytes_to_read, kMaxChunkSize); 160 DCHECK_LE(bytes_to_read, kMaxChunkSize);
161 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadFileChunk); 161 dbus::MethodCall method_call(mtpd::kMtpdInterface, mtpd::kReadFileChunk);
162 dbus::MessageWriter writer(&method_call); 162 dbus::MessageWriter writer(&method_call);
163 writer.AppendString(handle); 163 writer.AppendString(handle);
164 writer.AppendUint32(file_id); 164 writer.AppendUint32(file_id);
165 writer.AppendUint32(offset); 165 writer.AppendUint32(offset);
166 writer.AppendUint32(bytes_to_read); 166 writer.AppendUint32(bytes_to_read);
167 proxy_->CallMethod( 167 proxy_->CallMethod(
168 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, 168 &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
169 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnReadFile, 169 base::Bind(&MediaTransferProtocolDaemonClientImpl::OnReadFile,
170 weak_ptr_factory_.GetWeakPtr(), 170 weak_ptr_factory_.GetWeakPtr(),
171 callback, 171 callback,
172 error_callback)); 172 error_callback));
173 } 173 }
174 174
175 // MediaTransferProtocolDaemonClient override. 175 // MediaTransferProtocolDaemonClient override.
176 virtual void ListenForChanges( 176 virtual void ListenForChanges(
177 const MTPStorageEventHandler& handler) OVERRIDE { 177 const MTPStorageEventHandler& handler) override {
178 DCHECK(!listen_for_changes_called_); 178 DCHECK(!listen_for_changes_called_);
179 listen_for_changes_called_ = true; 179 listen_for_changes_called_ = true;
180 180
181 static const SignalEventTuple kSignalEventTuples[] = { 181 static const SignalEventTuple kSignalEventTuples[] = {
182 { mtpd::kMTPStorageAttached, true }, 182 { mtpd::kMTPStorageAttached, true },
183 { mtpd::kMTPStorageDetached, false }, 183 { mtpd::kMTPStorageDetached, false },
184 }; 184 };
185 const size_t kNumSignalEventTuples = arraysize(kSignalEventTuples); 185 const size_t kNumSignalEventTuples = arraysize(kSignalEventTuples);
186 186
187 for (size_t i = 0; i < kNumSignalEventTuples; ++i) { 187 for (size_t i = 0; i < kNumSignalEventTuples; ++i) {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 394
395 MediaTransferProtocolDaemonClient::~MediaTransferProtocolDaemonClient() {} 395 MediaTransferProtocolDaemonClient::~MediaTransferProtocolDaemonClient() {}
396 396
397 // static 397 // static
398 MediaTransferProtocolDaemonClient* MediaTransferProtocolDaemonClient::Create( 398 MediaTransferProtocolDaemonClient* MediaTransferProtocolDaemonClient::Create(
399 dbus::Bus* bus) { 399 dbus::Bus* bus) {
400 return new MediaTransferProtocolDaemonClientImpl(bus); 400 return new MediaTransferProtocolDaemonClientImpl(bus);
401 } 401 }
402 402
403 } // namespace device 403 } // namespace device
OLDNEW
« no previous file with comments | « device/hid/input_service_linux.cc ('k') | device/media_transfer_protocol/media_transfer_protocol_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698