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

Unified Diff: chrome/browser/media_galleries/fileapi/iphoto_file_util.cc

Issue 1432403003: Do not call stat() when reading directories via File API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed FSP tests. Created 5 years, 1 month 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/fileapi/iphoto_file_util.cc
diff --git a/chrome/browser/media_galleries/fileapi/iphoto_file_util.cc b/chrome/browser/media_galleries/fileapi/iphoto_file_util.cc
index 317d19fe98bca6ceed33e9db984ab251488fd999..112def1ba2b783c2a376d2ce17fe6a1aee3ca632 100644
--- a/chrome/browser/media_galleries/fileapi/iphoto_file_util.cc
+++ b/chrome/browser/media_galleries/fileapi/iphoto_file_util.cc
@@ -246,9 +246,8 @@ base::File::Error IPhotoFileUtil::ReadDirectorySync(
// Root directory. Child is the /Albums dir.
if (components.size() == 0) {
- file_list->push_back(DirectoryEntry(kIPhotoAlbumsDir,
- DirectoryEntry::DIRECTORY,
- 0, base::Time()));
+ file_list->push_back(
+ DirectoryEntry(kIPhotoAlbumsDir, DirectoryEntry::DIRECTORY));
return base::File::FILE_OK;
}
@@ -259,8 +258,7 @@ base::File::Error IPhotoFileUtil::ReadDirectorySync(
GetDataProvider()->GetAlbumNames();
for (std::vector<std::string>::const_iterator 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;
} else if (components.size() == 2) {
@@ -271,9 +269,8 @@ base::File::Error IPhotoFileUtil::ReadDirectorySync(
// Album dirs contain all photos in them.
if (GetDataProvider()->HasOriginals(components[1])) {
- file_list->push_back(DirectoryEntry(kIPhotoOriginalsDir,
- DirectoryEntry::DIRECTORY,
- 0, base::Time()));
+ file_list->push_back(
+ DirectoryEntry(kIPhotoOriginalsDir, DirectoryEntry::DIRECTORY));
}
std::map<std::string, base::FilePath> locations =
GetDataProvider()->GetAlbumContents(components[1]);
@@ -283,8 +280,7 @@ base::File::Error IPhotoFileUtil::ReadDirectorySync(
base::File::Info info;
if (!base::GetFileInfo(it->second, &info))
return base::File::FILE_ERROR_IO;
- file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE,
- info.size, info.last_modified));
+ file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE));
}
return base::File::FILE_OK;
} else if (components.size() == 3 &&
@@ -298,8 +294,7 @@ base::File::Error IPhotoFileUtil::ReadDirectorySync(
base::File::Info info;
if (!base::GetFileInfo(it->second, &info))
return base::File::FILE_ERROR_IO;
- file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE,
- info.size, info.last_modified));
+ file_list->push_back(DirectoryEntry(it->first, DirectoryEntry::FILE));
}
return base::File::FILE_OK;
}

Powered by Google App Engine
This is Rietveld 408576698