Chromium Code Reviews| 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 43891abcf91d41cc255e85c8de2ae54cdb869c7f..cafcca0f5784dcb4b4ec9c0e4b764a20ce572f82 100644 |
| --- a/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc |
| +++ b/chrome/browser/media_galleries/linux/mtp_device_task_helper.cc |
| @@ -168,6 +168,8 @@ void MTPDeviceTaskHelper::RenameObject( |
| error_callback)); |
| } |
| +MTPDeviceTaskHelper::MTPEntry::MTPEntry() : file_id(0) {} |
| + |
| // TODO(yawano) storage_name is not used, delete it. |
| void MTPDeviceTaskHelper::CopyFileFromLocal( |
| const std::string& storage_name, |
| @@ -260,20 +262,19 @@ void MTPDeviceTaskHelper::OnDidReadDirectory( |
| if (error) |
| return HandleDeviceError(error_callback, base::File::FILE_ERROR_FAILED); |
| - storage::AsyncFileUtil::EntryList entries; |
| + MTPEntries entries; |
| base::FilePath current; |
| MTPDeviceObjectEnumerator file_enum(file_entries); |
| while (!(current = file_enum.Next()).empty()) { |
| - storage::DirectoryEntry entry; |
| + MTPEntry entry; |
| entry.name = storage::VirtualPath::BaseName(current).value(); |
| uint32 file_id = 0; |
|
Lei Zhang
2015/11/12 07:25:17
Get rid of the temporary and pass |entry.file_id|
mtomasz
2015/11/12 07:48:24
Done.
|
| bool ret = file_enum.GetEntryId(&file_id); |
| DCHECK(ret); |
| - entry.name.push_back(','); |
| - entry.name += base::UintToString(file_id); |
| - entry.is_directory = file_enum.IsDirectory(); |
| - entry.size = file_enum.Size(); |
| - entry.last_modified_time = file_enum.LastModifiedTime(); |
| + entry.file_id = file_id; |
| + entry.file_info.is_directory = file_enum.IsDirectory(); |
| + entry.file_info.size = file_enum.Size(); |
| + entry.file_info.last_modified = file_enum.LastModifiedTime(); |
| entries.push_back(entry); |
| } |
| content::BrowserThread::PostTask( |