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

Unified Diff: chrome/browser/sync/glue/bookmark_change_processor.cc

Issue 7612015: sync: Make BaseNode::GetTitle() return std::string. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix syncapi_unittest Created 9 years, 4 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
Index: chrome/browser/sync/glue/bookmark_change_processor.cc
diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc
index f8b0561e3ca822dcaf95b1ce17f759f2d75bdbba..0e7461944047e14016d826ba82e23e9fff09fdc5 100644
--- a/chrome/browser/sync/glue/bookmark_change_processor.cc
+++ b/chrome/browser/sync/glue/bookmark_change_processor.cc
@@ -474,7 +474,7 @@ const BookmarkNode* BookmarkChangeProcessor::CreateOrUpdateBookmarkNode(
if (!src->GetIsFolder())
model->SetURL(dst, src->GetURL());
- model->SetTitle(dst, WideToUTF16Hack(src->GetTitle()));
+ model->SetTitle(dst, UTF8ToUTF16(src->GetTitle()));
SetBookmarkFavicon(src, dst, model);
}
@@ -496,10 +496,10 @@ const BookmarkNode* BookmarkChangeProcessor::CreateBookmarkNode(
const BookmarkNode* node;
if (sync_node->GetIsFolder()) {
node = model->AddFolder(parent, index,
- WideToUTF16Hack(sync_node->GetTitle()));
+ UTF8ToUTF16(sync_node->GetTitle()));
} else {
node = model->AddURL(parent, index,
- WideToUTF16Hack(sync_node->GetTitle()),
+ UTF8ToUTF16(sync_node->GetTitle()),
sync_node->GetURL());
SetBookmarkFavicon(sync_node, node, model);
}
« no previous file with comments | « chrome/browser/sync/engine/syncapi_unittest.cc ('k') | chrome/browser/sync/glue/bookmark_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698