chrome/browser/extensions/api/developer_private/developer_private_api.cc - Issue 13165005: 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: chrome/browser/extensions/api/developer_private/developer_private_api.cc

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

Patch Set: merge, fixes Created 7 years, 7 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

« no previous file with comments | « chrome/browser/component_updater/widevine_cdm_component_installer.cc ('k') | chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/developer_private/developer_private_api.cc

diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc

index 525102496f18fb33294a7f51fb3b4d5692cf45a4..85a782294dc86964dc7e13d118cf78335ad9f110 100644

--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc

+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc

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

#include "base/base64.h"

#include "base/file_util.h"

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

#include "base/i18n/file_util_icu.h"

#include "base/strings/string_number_conversions.h"

#include "base/utf_string_conversions.h"

@@ -79,9 +80,8 @@ GURL ToDataURL(const base::FilePath& path) {

}

std::vector<base::FilePath> ListFolder(const base::FilePath path) {

- file_util::FileEnumerator files(path, false,

- file_util::FileEnumerator::DIRECTORIES

- | file_util::FileEnumerator::FILES);

+ base::FileEnumerator files(path, false,

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

std::vector<base::FilePath> paths;

for (base::FilePath current_path = files.Next(); !current_path.empty();