| Index: base/files/file_enumerator_win.cc
|
| diff --git a/base/files/file_enumerator_win.cc b/base/files/file_enumerator_win.cc
|
| index 402a07209a8a24443d750481b75b9025540c2153..e629cc203e5e8892ca52fbf7d0b55987aa6324fa 100644
|
| --- a/base/files/file_enumerator_win.cc
|
| +++ b/base/files/file_enumerator_win.cc
|
| @@ -9,7 +9,6 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/threading/thread_restrictions.h"
|
| -#include "base/win/windows_version.h"
|
|
|
| namespace base {
|
|
|
| @@ -102,18 +101,14 @@ FilePath FileEnumerator::Next() {
|
| else
|
| src = src.Append(pattern_);
|
|
|
| - if (base::win::GetVersion() >= base::win::VERSION_WIN7) {
|
| - // Use a "large fetch" on newer Windows which should speed up large
|
| - // enumerations (we seldom abort in the middle).
|
| - find_handle_ = FindFirstFileEx(src.value().c_str(),
|
| - FindExInfoBasic, // Omit short name.
|
| - &find_data_,
|
| - FindExSearchNameMatch,
|
| - NULL,
|
| - FIND_FIRST_EX_LARGE_FETCH);
|
| - } else {
|
| - find_handle_ = FindFirstFile(src.value().c_str(), &find_data_);
|
| - }
|
| + // Use a "large fetch" which should speed up large enumerations (we seldom
|
| + // abort in the middle).
|
| + find_handle_ = FindFirstFileEx(src.value().c_str(),
|
| + FindExInfoBasic, // Omit short name.
|
| + &find_data_,
|
| + FindExSearchNameMatch,
|
| + NULL,
|
| + FIND_FIRST_EX_LARGE_FETCH);
|
| has_find_data_ = true;
|
| } else {
|
| // Search for the next file/directory.
|
|
|