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

Unified Diff: chrome/browser/importer/firefox2_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/history/text_database_manager.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/firefox2_importer.cc
===================================================================
--- chrome/browser/importer/firefox2_importer.cc (revision 6739)
+++ chrome/browser/importer/firefox2_importer.cc (working copy)
@@ -508,13 +508,13 @@
void Firefox2Importer::FindXMLFilesInDir(
const std::wstring& dir,
std::vector<std::wstring>* xml_files) {
- file_util::FileEnumerator file_enum(dir, false,
+ file_util::FileEnumerator file_enum(FilePath::FromWStringHack(dir), false,
file_util::FileEnumerator::FILES,
- L"*.xml");
- std::wstring file(file_enum.Next());
+ FILE_PATH_LITERAL("*.xml"));
+ std::wstring file(file_enum.Next().ToWStringHack());
while (!file.empty()) {
xml_files->push_back(file);
- file = file_enum.Next();
+ file = file_enum.Next().ToWStringHack();
}
}
« no previous file with comments | « chrome/browser/history/text_database_manager.cc ('k') | chrome/browser/importer/ie_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698