summaryrefslogtreecommitdiffstats
path: root/chrome/browser/importer/firefox2_importer.cc
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 14:55:12 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 14:55:12 +0000
commit0b733220c5fbef986647fce040c1b5d5e48be2b6 (patch)
tree72caaec198bd07c1e468c2a4805b00067da78126 /chrome/browser/importer/firefox2_importer.cc
parent64596e5e583f0c64124da1a79e496d6e063c25fa (diff)
downloadchromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.zip
chromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.tar.gz
chromium_src-0b733220c5fbef986647fce040c1b5d5e48be2b6.tar.bz2
Move file enumeration to filepaths.
Review URL: http://codereview.chromium.org/13315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer/firefox2_importer.cc')
-rw-r--r--chrome/browser/importer/firefox2_importer.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc
index aef2ba2..88da065 100644
--- a/chrome/browser/importer/firefox2_importer.cc
+++ b/chrome/browser/importer/firefox2_importer.cc
@@ -508,13 +508,13 @@ void Firefox2Importer::HTMLUnescape(std::wstring *text) {
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();
}
}