Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3174)

Unified Diff: base/file_util_win.cc

Issue 7157: Fix FileEnumerator (win) for non-recursive, directory-only enumerations.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/file_util_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/file_util_win.cc
===================================================================
--- base/file_util_win.cc (revision 3104)
+++ base/file_util_win.cc (working copy)
@@ -677,11 +677,8 @@
// it to pending_paths_ so we scan it after we finish scanning this
// directory.
pending_paths_.push(cur_file);
- return (file_type_ & FileEnumerator::DIRECTORIES) ? cur_file : Next();
}
-
- if ((file_type_ & FileEnumerator::DIRECTORIES) == 0)
- return Next();
+ return (file_type_ & FileEnumerator::DIRECTORIES) ? cur_file : Next();
}
return (file_type_ & FileEnumerator::FILES) ? cur_file : Next();
}
« no previous file with comments | « base/file_util_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698