From 8199b3ae54cd41ff1012a4cae3640028043b0bb4 Mon Sep 17 00:00:00 2001 From: "yuzo@chromium.org" Date: Tue, 9 Jun 2009 05:57:38 +0000 Subject: 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 --- chrome/common/zip.cc | 4 +++- chrome/common/zip_unittest.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'chrome/common') diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc index 9b34dcb..9ac6da3 100644 --- a/chrome/common/zip.cc +++ b/chrome/common/zip.cc @@ -281,7 +281,9 @@ bool Zip(const FilePath& src_dir, const FilePath& dest_file) { bool success = true; file_util::FileEnumerator file_enumerator( src_dir, true, // recursive - file_util::FileEnumerator::FILES_AND_DIRECTORIES); + static_cast( + file_util::FileEnumerator::FILES | + file_util::FileEnumerator::DIRECTORIES)); for (FilePath path = file_enumerator.Next(); !path.value().empty(); path = file_enumerator.Next()) { if (!AddEntryToZip(zip_file, path, src_dir)) { diff --git a/chrome/common/zip_unittest.cc b/chrome/common/zip_unittest.cc index 17ab1fa..0cffcf5 100644 --- a/chrome/common/zip_unittest.cc +++ b/chrome/common/zip_unittest.cc @@ -54,7 +54,9 @@ class ZipTest : public PlatformTest { ASSERT_TRUE(Unzip(path, test_dir_)); file_util::FileEnumerator files(test_dir_, true, - file_util::FileEnumerator::FILES_AND_DIRECTORIES); + static_cast( + file_util::FileEnumerator::FILES | + file_util::FileEnumerator::DIRECTORIES)); FilePath next_path = files.Next(); size_t count = 0; while (!next_path.value().empty()) { -- cgit v1.1