| Index: base/file_util_win.cc
|
| diff --git a/base/file_util_win.cc b/base/file_util_win.cc
|
| index 9a138a36e33a6a1eabe5944011e58aa090b0d181..fab91f6421ba4f9a8ee1c8381ca6625eebaa3bfe 100644
|
| --- a/base/file_util_win.cc
|
| +++ b/base/file_util_win.cc
|
| @@ -17,14 +17,14 @@
|
| #include "base/file_path.h"
|
| #include "base/logging.h"
|
| #include "base/metrics/histogram.h"
|
| -#include "base/win/pe_image.h"
|
| -#include "base/win/scoped_handle.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| #include "base/threading/thread_restrictions.h"
|
| #include "base/time.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "base/win/pe_image.h"
|
| #include "base/win/scoped_comptr.h"
|
| +#include "base/win/scoped_handle.h"
|
| #include "base/win/win_util.h"
|
| #include "base/win/windows_version.h"
|
|
|
| @@ -848,7 +848,7 @@ bool SetCurrentDirectory(const FilePath& directory) {
|
|
|
| FileEnumerator::FileEnumerator(const FilePath& root_path,
|
| bool recursive,
|
| - FileEnumerator::FILE_TYPE file_type)
|
| + FileType file_type)
|
| : recursive_(recursive),
|
| file_type_(file_type),
|
| has_find_data_(false),
|
| @@ -860,7 +860,7 @@ FileEnumerator::FileEnumerator(const FilePath& root_path,
|
|
|
| FileEnumerator::FileEnumerator(const FilePath& root_path,
|
| bool recursive,
|
| - FileEnumerator::FILE_TYPE file_type,
|
| + FileType file_type,
|
| const FilePath::StringType& pattern)
|
| : recursive_(recursive),
|
| file_type_(file_type),
|
|
|