| Index: chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| index add998203214118059402c5522912cc22c04664b..da4aeb009a2b0f4a07ebbdbef6f29624976afc62 100644
|
| --- a/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/itunes_file_util.cc
|
| @@ -195,12 +195,10 @@ base::File::Error ITunesFileUtil::ReadDirectorySync(
|
| base::File::Info xml_info;
|
| if (!base::GetFileInfo(GetDataProvider()->library_path(), &xml_info))
|
| return base::File::FILE_ERROR_IO;
|
| - file_list->push_back(DirectoryEntry(kITunesLibraryXML,
|
| - DirectoryEntry::FILE,
|
| - xml_info.size, xml_info.last_modified));
|
| - file_list->push_back(DirectoryEntry(kITunesMediaDir,
|
| - DirectoryEntry::DIRECTORY,
|
| - 0, base::Time()));
|
| + file_list->push_back(
|
| + DirectoryEntry(kITunesLibraryXML, DirectoryEntry::FILE));
|
| + file_list->push_back(
|
| + DirectoryEntry(kITunesMediaDir, DirectoryEntry::DIRECTORY));
|
| return base::File::FILE_OK;
|
| }
|
|
|
| @@ -212,13 +210,11 @@ base::File::Error ITunesFileUtil::ReadDirectorySync(
|
|
|
| if (components.size() == 1) {
|
| if (!GetDataProvider()->auto_add_path().empty()) {
|
| - file_list->push_back(DirectoryEntry(kITunesAutoAddDir,
|
| - DirectoryEntry::DIRECTORY,
|
| - 0, base::Time()));
|
| + file_list->push_back(
|
| + DirectoryEntry(kITunesAutoAddDir, DirectoryEntry::DIRECTORY));
|
| }
|
| - file_list->push_back(DirectoryEntry(kITunesMusicDir,
|
| - DirectoryEntry::DIRECTORY,
|
| - 0, base::Time()));
|
| + file_list->push_back(
|
| + DirectoryEntry(kITunesMusicDir, DirectoryEntry::DIRECTORY));
|
| return base::File::FILE_OK;
|
| }
|
|
|
| @@ -235,8 +231,7 @@ base::File::Error ITunesFileUtil::ReadDirectorySync(
|
| GetDataProvider()->GetArtistNames();
|
| std::set<ITunesDataProvider::ArtistName>::const_iterator it;
|
| for (it = artists.begin(); it != artists.end(); ++it)
|
| - file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY,
|
| - 0, base::Time()));
|
| + file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY));
|
| return base::File::FILE_OK;
|
| }
|
|
|
| @@ -247,8 +242,7 @@ base::File::Error ITunesFileUtil::ReadDirectorySync(
|
| return base::File::FILE_ERROR_NOT_FOUND;
|
| std::set<ITunesDataProvider::AlbumName>::const_iterator it;
|
| for (it = albums.begin(); it != albums.end(); ++it)
|
| - file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY,
|
| - 0, base::Time()));
|
| + file_list->push_back(DirectoryEntry(*it, DirectoryEntry::DIRECTORY));
|
| return base::File::FILE_OK;
|
| }
|
|
|
| @@ -262,9 +256,7 @@ base::File::Error ITunesFileUtil::ReadDirectorySync(
|
| base::File::Info file_info;
|
| if (media_path_filter()->Match(it->second) &&
|
| base::GetFileInfo(it->second, &file_info)) {
|
| - file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE,
|
| - file_info.size,
|
| - file_info.last_modified));
|
| + file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE));
|
| }
|
| }
|
| return base::File::FILE_OK;
|
|
|