From 0b733220c5fbef986647fce040c1b5d5e48be2b6 Mon Sep 17 00:00:00 2001 From: "avi@google.com" Date: Thu, 11 Dec 2008 14:55:12 +0000 Subject: 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 --- chrome/browser/importer/firefox2_importer.cc | 8 ++++---- chrome/browser/importer/ie_importer.cc | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'chrome/browser/importer') 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* 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(); } } diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index b171a9c..429b786 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -469,12 +469,13 @@ void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info, BookmarkVector* bookmarks) { std::wstring ie_folder = l10n_util::GetString(IDS_BOOKMARK_GROUP_FROM_IE); BookmarkVector toolbar_bookmarks; - std::wstring file; + FilePath file; std::vector 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()); -- cgit v1.1