diff options
Diffstat (limited to 'chrome/browser/importer/ie_importer.cc')
-rw-r--r-- | chrome/browser/importer/ie_importer.cc | 9 |
1 files changed, 5 insertions, 4 deletions
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<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()); |