Index: chrome/browser/gtk/bookmark_menu_controller_gtk.cc |
diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc |
index 4d7ecd9521a5873e8d5d1306f3dc1456412a77f0..21939c1359f1a4f011f78b43dd0e0380ea7683e1 100644 |
--- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc |
+++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc |
@@ -155,11 +155,10 @@ void BookmarkMenuController::BuildMenu(const BookmarkNode* parent, |
// This breaks on word boundaries. Ideally we would break on character |
// boundaries. |
- std::string elided_name = WideToUTF8( |
- l10n_util::TruncateString(UTF16ToWideHack(node->GetTitle()), |
- kMaxChars)); |
+ string16 elided_name = l10n_util::TruncateString(node->GetTitle(), |
+ kMaxChars); |
GtkWidget* menu_item = |
- gtk_image_menu_item_new_with_label(elided_name.c_str()); |
+ gtk_image_menu_item_new_with_label(UTF16ToUTF8(elided_name).c_str()); |
g_object_set_data(G_OBJECT(menu_item), "bookmark-node", AsVoid(node)); |
SetImageMenuItem(menu_item, node, profile_->GetBookmarkModel()); |
gtk_util::SetAlwaysShowImage(menu_item); |