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

Unified Diff: chrome/browser/importer/firefox3_importer.cc

Issue 18805: Correct sqlite wrapper behavior on systems where wchar_t is UTF-32, (Closed)
Patch Set: minor fixes Created 11 years, 11 months 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/history/visitsegment_database.cc ('k') | chrome/browser/meta_table_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/importer/firefox3_importer.cc
diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc
index ea470d57d2085b2c35cbe7c93b2d0efb429123ac..cb2f13fc840f8cbfa56827d9f1f7088e5e7179f2 100644
--- a/chrome/browser/importer/firefox3_importer.cc
+++ b/chrome/browser/importer/firefox3_importer.cc
@@ -103,7 +103,7 @@ void Firefox3Importer::ImportHistory() {
continue;
history::URLRow row(url);
- row.set_title(s.column_string16(1));
+ row.set_title(s.column_wstring(1));
row.set_visit_count(s.column_int(2));
row.set_hidden(s.column_int(3) == 1);
row.set_typed_count(s.column_int(4));
@@ -421,7 +421,7 @@ void Firefox3Importer::GetTopBookmarkFolder(sqlite3* db, int folder_id,
BookmarkItem* item = new BookmarkItem;
item->parent = -1; // The top level folder has no parent.
item->id = folder_id;
- item->title = s.column_string16(0);
+ item->title = s.column_wstring(0);
item->type = 2;
item->favicon = 0;
list->push_back(item);
@@ -453,7 +453,7 @@ void Firefox3Importer::GetWholeBookmarkFolder(sqlite3* db, BookmarkList* list,
item->parent = static_cast<int>(position);
item->id = s.column_int(0);
item->url = GURL(s.column_string(1));
- item->title = s.column_string16(2);
+ item->title = s.column_wstring(2);
item->type = s.column_int(3);
item->keyword = s.column_string(4);
item->date_added = Time::FromTimeT(s.column_int64(5)/1000000);
« no previous file with comments | « chrome/browser/history/visitsegment_database.cc ('k') | chrome/browser/meta_table_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698