diff options
| author | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 05:57:38 +0000 |
|---|---|---|
| committer | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-09 05:57:38 +0000 |
| commit | 8199b3ae54cd41ff1012a4cae3640028043b0bb4 (patch) | |
| tree | 5718d8e8cdc3889a7c82271f0beb8094b0914531 /net/base | |
| parent | 9c0b3e3a30ab2246a9385b978e86003d4fc8ceb9 (diff) | |
| download | chromium_src-8199b3ae54cd41ff1012a4cae3640028043b0bb4.zip chromium_src-8199b3ae54cd41ff1012a4cae3640028043b0bb4.tar.gz chromium_src-8199b3ae54cd41ff1012a4cae3640028043b0bb4.tar.bz2 | |
Include a parent directory link in the file list for file:///somepath
Also, order files/directories lexicographically.
TEST=on linux, type file:///usr/ in the address bar and make sure the contents
are sorted and include an entry for '..', which is [parent directory].
On windows, type file:///C:/Users/ .
BUG=12621, 12812
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/directory_lister.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index 581c087..616fc82 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc @@ -85,7 +85,10 @@ void DirectoryLister::ThreadMain() { } file_util::FileEnumerator file_enum(dir_, false, - file_util::FileEnumerator::FILES_AND_DIRECTORIES); + static_cast<file_util::FileEnumerator::FILE_TYPE>( + file_util::FileEnumerator::FILES | + file_util::FileEnumerator::DIRECTORIES | + file_util::FileEnumerator::INCLUDE_DOT_DOT)); while (!canceled_ && !(file_enum.Next().value().empty())) { file_enum.GetFindInfo(&e->data[e->count]); |