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

Unified Diff: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc

Issue 437313002: Media Galleries: Omit ById in various method names, since all operations are now by id. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
diff --git a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
index 80fa85186008b8ad696e5eee57abe18aaa858355..0282c8a0e59036e6a34428c1c550b6d75d8b796a 100644
--- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
+++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc
@@ -75,7 +75,7 @@ void MTPDeviceTaskHelper::OpenStorage(const std::string& storage_name,
callback));
}
-void MTPDeviceTaskHelper::GetFileInfoById(
+void MTPDeviceTaskHelper::GetFileInfo(
uint32 file_id,
const GetFileInfoSuccessCallback& success_callback,
const ErrorCallback& error_callback) {
@@ -83,7 +83,7 @@ void MTPDeviceTaskHelper::GetFileInfoById(
if (device_handle_.empty())
return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);
- GetMediaTransferProtocolManager()->GetFileInfoById(
+ GetMediaTransferProtocolManager()->GetFileInfo(
device_handle_, file_id,
base::Bind(&MTPDeviceTaskHelper::OnGetFileInfo,
weak_ptr_factory_.GetWeakPtr(),
@@ -91,7 +91,7 @@ void MTPDeviceTaskHelper::GetFileInfoById(
error_callback));
}
-void MTPDeviceTaskHelper::ReadDirectoryById(
+void MTPDeviceTaskHelper::ReadDirectory(
uint32 dir_id,
const ReadDirectorySuccessCallback& success_callback,
const ErrorCallback& error_callback) {
@@ -99,9 +99,9 @@ void MTPDeviceTaskHelper::ReadDirectoryById(
if (device_handle_.empty())
return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED);
- GetMediaTransferProtocolManager()->ReadDirectoryById(
+ GetMediaTransferProtocolManager()->ReadDirectory(
device_handle_, dir_id,
- base::Bind(&MTPDeviceTaskHelper::OnDidReadDirectoryById,
+ base::Bind(&MTPDeviceTaskHelper::OnDidReadDirectory,
weak_ptr_factory_.GetWeakPtr(),
success_callback,
error_callback));
@@ -130,7 +130,7 @@ void MTPDeviceTaskHelper::ReadBytes(
base::File::FILE_ERROR_FAILED);
}
- GetMediaTransferProtocolManager()->GetFileInfoById(
+ GetMediaTransferProtocolManager()->GetFileInfo(
device_handle_, request.file_id,
base::Bind(&MTPDeviceTaskHelper::OnGetFileInfoToReadBytes,
weak_ptr_factory_.GetWeakPtr(), request));
@@ -172,7 +172,7 @@ void MTPDeviceTaskHelper::OnGetFileInfo(
base::Bind(success_callback, FileInfoFromMTPFileEntry(file_entry)));
}
-void MTPDeviceTaskHelper::OnDidReadDirectoryById(
+void MTPDeviceTaskHelper::OnDidReadDirectory(
const ReadDirectorySuccessCallback& success_callback,
const ErrorCallback& error_callback,
const std::vector<MtpFileEntry>& file_entries,
@@ -237,7 +237,7 @@ void MTPDeviceTaskHelper::OnGetFileInfoToReadBytes(
base::checked_cast<uint32>(request.buf_len),
base::saturated_cast<uint32>(file_info.size - request.offset));
- GetMediaTransferProtocolManager()->ReadFileChunkById(
+ GetMediaTransferProtocolManager()->ReadFileChunk(
device_handle_,
request.file_id,
base::checked_cast<uint32>(request.offset),

Powered by Google App Engine
This is Rietveld 408576698