webkit/fileapi/file_system_directory_database.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: webkit/fileapi/file_system_directory_database.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: Addressed the comments about constant names. 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

« webkit/fileapi/file_system_database_test_helper.cc ('K') | « webkit/fileapi/file_system_database_test_helper.cc ('k') | webkit/fileapi/isolated_file_util_unittest.cc » ('j') | webkit/fileapi/local_file_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webkit/fileapi/file_system_directory_database.cc

diff --git a/webkit/fileapi/file_system_directory_database.cc b/webkit/fileapi/file_system_directory_database.cc

index 16ec2f8af0f9fa072e22f2d03976841c33335273..b93ac05f1ae5c1cf3f46165c673e4c56dd761093 100644

--- a/webkit/fileapi/file_system_directory_database.cc

+++ b/webkit/fileapi/file_system_directory_database.cc

@@ -273,10 +273,9 @@ bool DatabaseCheckHelper::ScanDirectory() {

file_util::FileEnumerator file_enum(

dir_path.empty() ? path_ : path_.Append(dir_path),

- false /* recursive */,

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

- file_util::FileEnumerator::DIRECTORIES |

- file_util::FileEnumerator::FILES));

+ false /* not recursive */,

+ (file_util::FileEnumerator::DIRECTORIES |

+ file_util::FileEnumerator::FILES));

kinuko 2012/08/07 05:23:11 extra parens

Haruki Sato 2012/08/07 13:34:25 Done.

FilePath absolute_file_path;

while (!(absolute_file_path = file_enum.Next()).empty()) {