chrome/common/zip.cc - Issue 10855002: Change the type of file_type parameter to int, as the parameter actually takes or-ed bitmasks,

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: chrome/common/zip.cc

Issue 10855002: Change the type of file_type parameter to int, as the parameter actually takes or-ed bitmasks, (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 4 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

« chrome/common/extensions/extension_file_util.cc ('K') | « chrome/common/extensions/extension_file_util.cc ('k') | chrome/common/zip_unittest.cc » ('j') | chrome/installer/setup/uninstall.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/zip.cc

diff --git a/chrome/common/zip.cc b/chrome/common/zip.cc

index ef50eadd6a0a6dc1a5f75302890df256b8c99637..05a49ee040f710ef44a37d6745dacb187c58fa3e 100644

--- a/chrome/common/zip.cc

+++ b/chrome/common/zip.cc

@@ -132,9 +132,8 @@ bool ZipWithFilterCallback(const FilePath& src_dir, const FilePath& dest_file,

bool success = true;

file_util::FileEnumerator file_enumerator(

src_dir, true, // recursive

jar (doing other things) 2012/08/06 18:27:02 nit: consider pushing args back onto line 133.

Haruki Sato 2012/08/06 23:22:18 Done.

- static_cast<file_util::FileEnumerator::FileType>(

- file_util::FileEnumerator::FILES |

- file_util::FileEnumerator::DIRECTORIES));

+ (file_util::FileEnumerator::FILES |

+ file_util::FileEnumerator::DIRECTORIES));

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

path = file_enumerator.Next()) {

if (!filter_cb.Run(path)) {