Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(637)

Unified Diff: trunk/src/third_party/leveldatabase/env_chromium.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:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/third_party/leveldatabase/env_chromium.cc
===================================================================
--- trunk/src/third_party/leveldatabase/env_chromium.cc (revision 198849)
+++ trunk/src/third_party/leveldatabase/env_chromium.cc (working copy)
@@ -10,7 +10,6 @@
#include "base/at_exit.h"
#include "base/debug/trace_event.h"
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
@@ -455,8 +454,8 @@
virtual Status GetChildren(const std::string& dir,
std::vector<std::string>* result) {
result->clear();
- base::FileEnumerator iter(
- CreateFilePath(dir), false, base::FileEnumerator::FILES);
+ ::file_util::FileEnumerator iter(
+ CreateFilePath(dir), false, ::file_util::FileEnumerator::FILES);
base::FilePath current = iter.Next();
while (!current.empty()) {
result->push_back(FilePathToString(current.BaseName()));
« no previous file with comments | « trunk/src/remoting/host/policy_hack/policy_watcher_linux.cc ('k') | trunk/src/third_party/zlib/google/zip.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698