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

Unified Diff: chrome/browser/gtk/bookmark_menu_controller_gtk.cc

Issue 5742006: wstrings: make l10n_util::TruncateString use string16 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years 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/extensions/extension_menu_manager.cc ('k') | chrome/browser/gtk/bookmark_utils_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « chrome/browser/extensions/extension_menu_manager.cc ('k') | chrome/browser/gtk/bookmark_utils_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698