From 7caca8a26f5db3d6895f59a9037f87e7e4a0e680 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sat, 21 Aug 2010 18:25:31 +0000 Subject: Remove wstrings from bookmarks, part 7. BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3140022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57000 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/bookmarks/bookmark_codec.cc | 4 ++-- chrome/browser/bookmarks/bookmark_model.cc | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'chrome/browser/bookmarks') diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index 6edbadf..1b0dd45 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -157,9 +157,9 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, // the file. bb_node->set_type(BookmarkNode::BOOKMARK_BAR); other_folder_node->set_type(BookmarkNode::OTHER_NODE); - bb_node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME)); + bb_node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME)); other_folder_node->SetTitle( - l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); return true; } diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 79892b1..995e716 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -705,10 +705,12 @@ BookmarkNode* BookmarkModel::CreateRootNodeFromStarredEntry( entry.type == history::StarredEntry::OTHER); BookmarkNode* node = new BookmarkNode(generate_next_node_id(), GURL()); node->Reset(entry); - if (entry.type == history::StarredEntry::BOOKMARK_BAR) - node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_FOLDER_NAME)); - else - node->SetTitle(l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + if (entry.type == history::StarredEntry::BOOKMARK_BAR) { + node->SetTitle(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME)); + } else { + node->SetTitle( + l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + } return node; } -- cgit v1.1