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

Unified Diff: trunk/src/chrome/browser/importer/ie_importer.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/chrome/browser/importer/ie_importer.cc
===================================================================
--- trunk/src/chrome/browser/importer/ie_importer.cc (revision 198849)
+++ trunk/src/chrome/browser/importer/ie_importer.cc (working copy)
@@ -16,7 +16,6 @@
#include <vector>
#include "base/file_util.h"
-#include "base/files/file_enumerator.h"
#include "base/files/file_path.h"
#include "base/string16.h"
#include "base/string_util.h"
@@ -817,8 +816,8 @@
// Favorites path length. Make sure it doesn't include the trailing \.
size_t favorites_path_len =
favorites_path.StripTrailingSeparators().value().size();
- base::FileEnumerator file_enumerator(
- favorites_path, true, base::FileEnumerator::FILES);
+ file_util::FileEnumerator file_enumerator(
+ favorites_path, true, file_util::FileEnumerator::FILES);
while (!(file = file_enumerator.Next()).value().empty() && !cancelled())
file_list.push_back(file.value());
« no previous file with comments | « trunk/src/chrome/browser/importer/firefox3_importer.cc ('k') | trunk/src/chrome/browser/policy/config_dir_policy_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698