diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 23:43:29 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 23:43:29 +0000 |
| commit | a82026e0a7c0b5f3672f92242d4180cc52328add (patch) | |
| tree | 30c2625d8d44d1b12c79e963256b655d28a45a71 /base/file_util_posix.cc | |
| parent | 1346ecce2c718b2237cbb8ba95e9674f2e381943 (diff) | |
| download | chromium_src-a82026e0a7c0b5f3672f92242d4180cc52328add.zip chromium_src-a82026e0a7c0b5f3672f92242d4180cc52328add.tar.gz chromium_src-a82026e0a7c0b5f3672f92242d4180cc52328add.tar.bz2 | |
Un-recursify FileEnumerator::Next().
BUG=58368
TEST=file_util_unittest.cc passes
Review URL: http://codereview.chromium.org/3751001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/file_util_posix.cc')
| -rw-r--r-- | base/file_util_posix.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc index 4eae781..8660054 100644 --- a/base/file_util_posix.cc +++ b/base/file_util_posix.cc @@ -564,8 +564,7 @@ FileEnumerator::FileEnumerator(const FilePath& root_path, : current_directory_entry_(0), root_path_(root_path), recursive_(recursive), - file_type_(file_type), - is_in_find_op_(false) { + file_type_(file_type) { // INCLUDE_DOT_DOT must not be specified if recursive. DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_))); pending_paths_.push(root_path); @@ -579,8 +578,7 @@ FileEnumerator::FileEnumerator(const FilePath& root_path, root_path_(root_path), recursive_(recursive), file_type_(file_type), - pattern_(root_path.Append(pattern).value()), - is_in_find_op_(false) { + pattern_(root_path.Append(pattern).value()) { // INCLUDE_DOT_DOT must not be specified if recursive. DCHECK(!(recursive && (INCLUDE_DOT_DOT & file_type_))); // The Windows version of this code appends the pattern to the root_path, |