trunk/src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc - Issue 14824006: Revert 198820 "Move FileEnumerator to its own file, do some refa..."

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: trunk/src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

Issue 14824006: Revert 198820 "Move FileEnumerator to its own file, do some refa..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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:

Index: trunk/src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

===================================================================

--- trunk/src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc (revision 198849)

+++ trunk/src/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc (working copy)

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

#include "base/command_line.h"

#include "base/compiler_specific.h"

#include "base/file_util.h"

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

#include "base/files/file_path.h"

#include "base/json/json_file_value_serializer.h"

#include "base/logging.h"

@@ -127,8 +126,8 @@

// Enumerate all versions starting from the base directory.

base::FilePath base_dir = pci->GetPnaclBaseDirectory();

bool found = false;

- base::FileEnumerator

- file_enumerator(base_dir, false, base::FileEnumerator::DIRECTORIES);

+ file_util::FileEnumerator

+ file_enumerator(base_dir, false, file_util::FileEnumerator::DIRECTORIES);

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

path = file_enumerator.Next()) {

Version version(path.BaseName().MaybeAsASCII());