chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc - Issue 16392011: 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/serial/serial_port_enumerator_posix.cc

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

Patch Set: fix incorrect includes Created 7 years, 6 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/extensions/api/developer_private/developer_private_api.cc ('k') | chrome/browser/extensions/api/storage/settings_backend.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc

diff --git a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc

index ce29ea58ae360372a177535f34b6c9b6c741cce9..505d8b050625270437e82bc19a8e6b0a0cd89a4e 100644

--- a/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc

+++ b/chrome/browser/extensions/api/serial/serial_port_enumerator_posix.cc

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

#include "chrome/browser/extensions/api/serial/serial_port_enumerator.h"

#include "base/file_util.h"

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

#include "base/files/file_path.h"

#include "base/string_util.h"

#include "content/public/browser/browser_thread.h"

@@ -67,13 +68,12 @@ SerialPortEnumerator::GenerateValidSerialPortNames() {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));

const base::FilePath kDevRoot("/dev");

const int kFilesAndSymLinks =

- file_util::FileEnumerator::FILES |

- file_util::FileEnumerator::SHOW_SYM_LINKS;

+ base::FileEnumerator::FILES |

+ base::FileEnumerator::SHOW_SYM_LINKS;

StringSet valid_patterns = GenerateValidPatterns();

StringSet name_set;

- file_util::FileEnumerator enumerator(

- kDevRoot, false, kFilesAndSymLinks);

+ base::FileEnumerator enumerator(kDevRoot, false, kFilesAndSymLinks);

do {

const base::FilePath next_device_path(enumerator.Next());

const std::string next_device = next_device_path.value();