| Index: base/file_util.h
|
| diff --git a/base/file_util.h b/base/file_util.h
|
| index a6bb9722fcb239fce53fb31a02221a04a50d2e02..cd7fa9fafcbe68865e578b3c173adb84419e34e7 100644
|
| --- a/base/file_util.h
|
| +++ b/base/file_util.h
|
| @@ -423,7 +423,7 @@ class BASE_EXPORT FileEnumerator {
|
| } FindInfo;
|
| #endif
|
|
|
| - enum FILE_TYPE {
|
| + enum FileType {
|
| FILES = 1 << 0,
|
| DIRECTORIES = 1 << 1,
|
| INCLUDE_DOT_DOT = 1 << 2,
|
| @@ -454,10 +454,10 @@ class BASE_EXPORT FileEnumerator {
|
| // TODO(erikkay): Fix the pattern matching to work at all levels.
|
| FileEnumerator(const FilePath& root_path,
|
| bool recursive,
|
| - FileEnumerator::FILE_TYPE file_type);
|
| + FileType file_type);
|
| FileEnumerator(const FilePath& root_path,
|
| bool recursive,
|
| - FileEnumerator::FILE_TYPE file_type,
|
| + FileType file_type,
|
| const FilePath::StringType& pattern);
|
| ~FileEnumerator();
|
|
|
| @@ -503,7 +503,7 @@ class BASE_EXPORT FileEnumerator {
|
|
|
| FilePath root_path_;
|
| bool recursive_;
|
| - FILE_TYPE file_type_;
|
| + FileType file_type_;
|
| FilePath::StringType pattern_; // Empty when we want to find everything.
|
|
|
| // A stack that keeps track of which subdirectories we still need to
|
|
|