chrome/browser/component_updater/pnacl/pnacl_component_installer.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/component_updater/pnacl/pnacl_component_installer.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/pepper_flash_component_installer.cc ('k') | chrome/browser/component_updater/swiftshader_component_installer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

index f66b8a9a42edd7bed6c3611867217bbcd328805b..07e5abcfca209f0da1615984c46a2eb1d36a935d 100644

--- a/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

+++ b/chrome/browser/component_updater/pnacl/pnacl_component_installer.cc

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

#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"

@@ -126,8 +127,8 @@ bool GetLatestPnaclDirectory(PnaclComponentInstaller* pci,

// Enumerate all versions starting from the base directory.

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

bool found = false;

- file_util::FileEnumerator

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

+ base::FileEnumerator

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

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

path = file_enumerator.Next()) {

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