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

Unified Diff: chrome/browser/history/text_database_manager.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/greasemonkey_master.cc ('k') | chrome/browser/importer/firefox2_importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/text_database_manager.cc
===================================================================
--- chrome/browser/history/text_database_manager.cc (revision 6739)
+++ chrome/browser/history/text_database_manager.cc (working copy)
@@ -147,11 +147,12 @@
present_databases_loaded_ = true;
// Find files on disk matching our pattern so we can quickly test for them.
- file_util::FileEnumerator enumerator(dir_, false,
+ file_util::FileEnumerator enumerator(FilePath::FromWStringHack(dir_), false,
file_util::FileEnumerator::FILES,
- std::wstring(TextDatabase::file_base()) + L"*");
+ FilePath::FromWStringHack(
+ std::wstring(TextDatabase::file_base()) + L"*").value());
std::wstring cur_file;
- while (!(cur_file = enumerator.Next()).empty()) {
+ while (!(cur_file = enumerator.Next().ToWStringHack()).empty()) {
// Convert to the number representing this file.
TextDatabase::DBIdent id = TextDatabase::FileNameToID(cur_file);
if (id) // Will be 0 on error.
« no previous file with comments | « chrome/browser/greasemonkey_master.cc ('k') | chrome/browser/importer/firefox2_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698