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

Unified Diff: chrome/browser/importer/ie_importer.cc

Issue 13315: Move file enumeration to filepaths. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years 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/importer/firefox2_importer.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/ie_importer.cc
===================================================================
--- chrome/browser/importer/ie_importer.cc (revision 6739)
+++ chrome/browser/importer/ie_importer.cc (working copy)
@@ -469,12 +469,13 @@
BookmarkVector* bookmarks) {
std::wstring ie_folder = l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_IE);
BookmarkVector toolbar_bookmarks;
- std::wstring file;
+ FilePath file;
std::vector<std::wstring> file_list;
- file_util::FileEnumerator file_enumerator(info.path, true,
+ file_util::FileEnumerator file_enumerator(
+ FilePath::FromWStringHack(info.path), true,
file_util::FileEnumerator::FILES);
- while (!(file = file_enumerator.Next()).empty() && !cancelled())
- file_list.push_back(file);
+ while (!(file = file_enumerator.Next()).value().empty() && !cancelled())
+ file_list.push_back(file.ToWStringHack());
// Keep the bookmarks in alphabetical order.
std::sort(file_list.begin(), file_list.end());
« no previous file with comments | « chrome/browser/importer/firefox2_importer.cc ('k') | chrome/browser/printing/printing_layout_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698