| Index: base/file_util_posix.cc
|
| diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
|
| index cbfcfb0bdd454c05c9b4b05e7c77ac55bffdd4fd..7e4c3a9709d37236265e827f3f3533ff19b4ceb0 100644
|
| --- a/base/file_util_posix.cc
|
| +++ b/base/file_util_posix.cc
|
| @@ -641,26 +641,6 @@ FileEnumerator::FileEnumerator(const FilePath& root_path,
|
| FileEnumerator::~FileEnumerator() {
|
| }
|
|
|
| -void FileEnumerator::GetFindInfo(FindInfo* info) {
|
| - DCHECK(info);
|
| -
|
| - if (current_directory_entry_ >= directory_entries_.size())
|
| - return;
|
| -
|
| - DirectoryEntryInfo* cur_entry = &directory_entries_[current_directory_entry_];
|
| - memcpy(&(info->stat), &(cur_entry->stat), sizeof(info->stat));
|
| - info->filename.assign(cur_entry->filename.value());
|
| -}
|
| -
|
| -bool FileEnumerator::IsDirectory(const FindInfo& info) {
|
| - return S_ISDIR(info.stat.st_mode);
|
| -}
|
| -
|
| -// static
|
| -FilePath FileEnumerator::GetFilename(const FindInfo& find_info) {
|
| - return FilePath(find_info.filename);
|
| -}
|
| -
|
| FilePath FileEnumerator::Next() {
|
| ++current_directory_entry_;
|
|
|
| @@ -702,6 +682,26 @@ FilePath FileEnumerator::Next() {
|
| ].filename);
|
| }
|
|
|
| +void FileEnumerator::GetFindInfo(FindInfo* info) {
|
| + DCHECK(info);
|
| +
|
| + if (current_directory_entry_ >= directory_entries_.size())
|
| + return;
|
| +
|
| + DirectoryEntryInfo* cur_entry = &directory_entries_[current_directory_entry_];
|
| + memcpy(&(info->stat), &(cur_entry->stat), sizeof(info->stat));
|
| + info->filename.assign(cur_entry->filename.value());
|
| +}
|
| +
|
| +bool FileEnumerator::IsDirectory(const FindInfo& info) {
|
| + return S_ISDIR(info.stat.st_mode);
|
| +}
|
| +
|
| +// static
|
| +FilePath FileEnumerator::GetFilename(const FindInfo& find_info) {
|
| + return FilePath(find_info.filename);
|
| +}
|
| +
|
| bool FileEnumerator::ReadDirectory(std::vector<DirectoryEntryInfo>* entries,
|
| const FilePath& source, bool show_links) {
|
| base::ThreadRestrictions::AssertIOAllowed();
|
|
|