third_party/zlib/google/zip.cc - Issue 16392011: Move FileEnumerator to its own file, do some refactoring.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/zlib/google/zip.cc

Issue 16392011: Move FileEnumerator to its own file, do some refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix incorrect includes Created 7 years, 6 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:

Index: third_party/zlib/google/zip.cc

diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc

index e24449bdb03b8c29af4b7779bbd5122e93b01e76..2e46beded0ed689ef6921de5d1c9d9d64fbbfb05 100644

--- a/third_party/zlib/google/zip.cc

+++ b/third_party/zlib/google/zip.cc

@@ -6,6 +6,7 @@

#include "base/bind.h"

#include "base/file_util.h"

+#include "base/files/file_enumerator.h"

#include "base/logging.h"

#include "base/string16.h"

#include "base/string_util.h"

@@ -137,9 +138,8 @@ bool ZipWithFilterCallback(const base::FilePath& src_dir,

}

bool success = true;

- file_util::FileEnumerator file_enumerator(src_dir, true /* recursive */,

- file_util::FileEnumerator::FILES |

- file_util::FileEnumerator::DIRECTORIES);

+ base::FileEnumerator file_enumerator(src_dir, true /* recursive */,

+ base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);

for (base::FilePath path = file_enumerator.Next(); !path.value().empty();

path = file_enumerator.Next()) {

if (!filter_cb.Run(path)) {

« no previous file with comments | « third_party/leveldatabase/env_chromium.cc ('k') | third_party/zlib/google/zip_unittest.cc » ('j') | no next file with comments »