diff options
| author | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 14:55:12 +0000 |
|---|---|---|
| committer | avi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-11 14:55:12 +0000 |
| commit | 0b733220c5fbef986647fce040c1b5d5e48be2b6 (patch) | |
| tree | 72caaec198bd07c1e468c2a4805b00067da78126 /chrome/browser/importer/ie_importer.cc | |
| parent | 64596e5e583f0c64124da1a79e496d6e063c25fa (diff) | |
| download | chromium_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/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()); |