diff options
author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
---|---|---|
committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 22:05:59 +0000 |
commit | fbf745a2c70813a8fca9d5de6574fc602b3ebfeb (patch) | |
tree | 818185d9363d9193ee54e0d0a442f937804f84bf /base/file_util.h | |
parent | 552079df978b40210f549546739b6393fdc3b8b0 (diff) | |
download | chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.zip chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.gz chromium_src-fbf745a2c70813a8fca9d5de6574fc602b3ebfeb.tar.bz2 |
file_util: The member variable |pattern_| has a different type (FilePath) from the constructor parameter (StringType).
So fix this type to match with the constructor.
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/465119/show
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/466071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34092 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util.h')
-rw-r--r-- | base/file_util.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/base/file_util.h b/base/file_util.h index b91e6b7..e97f498 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -434,19 +434,6 @@ class FileEnumerator { void GetFindInfo(FindInfo* info); private: - FilePath root_path_; - bool recursive_; - FILE_TYPE file_type_; - FilePath pattern_; // Empty when we want to find everything. - - // Set to true when there is a find operation open. This way, we can lazily - // start the operations when the caller calls Next(). - bool is_in_find_op_; - - // A stack that keeps track of which subdirectories we still need to - // enumerate in the breadth-first search. - std::stack<FilePath> pending_paths_; - // Returns true if the given path should be skipped in enumeration. bool ShouldSkip(const FilePath& path); @@ -476,6 +463,19 @@ class FileEnumerator { size_t current_directory_entry_; #endif + FilePath root_path_; + bool recursive_; + FILE_TYPE file_type_; + FilePath::StringType pattern_; // Empty when we want to find everything. + + // Set to true when there is a find operation open. This way, we can lazily + // start the operations when the caller calls Next(). + bool is_in_find_op_; + + // A stack that keeps track of which subdirectories we still need to + // enumerate in the breadth-first search. + std::stack<FilePath> pending_paths_; + DISALLOW_COPY_AND_ASSIGN(FileEnumerator); }; |