summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_tree_model.cc
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-30 05:31:40 +0000
commit440b37b2c3a29be151a7262d9188d5e8151176fb (patch)
treeb2cc9283d1efd597472619dcfd016a4a0f0e32ff /chrome/browser/gtk/bookmark_tree_model.cc
parent6cd3bd20cd448bc1bca33748395bf4381dfb7fc6 (diff)
downloadchromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.zip
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.gz
chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.bz2
Remove the wstring TreeModelNode::GetTitle() and rename GetTitleAsString16() to GetTitle().
BUG=23581 TEST=builds and passes tests Review URL: http://codereview.chromium.org/3279005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_tree_model.cc')
-rw-r--r--chrome/browser/gtk/bookmark_tree_model.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc
index 041b0b6..d6ef4de 100644
--- a/chrome/browser/gtk/bookmark_tree_model.cc
+++ b/chrome/browser/gtk/bookmark_tree_model.cc
@@ -7,6 +7,7 @@
#include <gtk/gtk.h>
#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/gtk/bookmark_utils_gtk.h"
#include "chrome/browser/gtk/gtk_theme_provider.h"
@@ -26,7 +27,7 @@ void AddSingleNodeToTreeStore(GtkTreeStore* store, const BookmarkNode* node,
gtk_tree_store_set(store, iter,
bookmark_utils::FOLDER_ICON, GtkThemeProvider::GetFolderIcon(true),
bookmark_utils::FOLDER_NAME,
- UTF16ToUTF8(node->GetTitleAsString16()).c_str(),
+ UTF16ToUTF8(node->GetTitle()).c_str(),
bookmark_utils::ITEM_ID, node->id(),
// We don't want to use node->is_folder() because that would let the
// user edit "Bookmarks Bar" and "Other Bookmarks".