GTK: Refinements to the global menu.

chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 135 matching lines @@
          start_child_index < parent->child_count());
 
   signals_.Connect(menu, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressedOrReleasedThunk), this);
   signals_.Connect(menu, "button-release-event",
                    G_CALLBACK(OnMenuButtonPressedOrReleasedThunk), this);
 
   for (int i = start_child_index; i < parent->child_count(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
 
-    // This breaks on word boundaries. Ideally we would break on character
-    // boundaries.
-    string16 elided_name = l10n_util::TruncateString(node->GetTitle(),
-                                                     kMaxChars);
-    GtkWidget* menu_item =
-        gtk_image_menu_item_new_with_label(UTF16ToUTF8(elided_name).c_str());
+    GtkWidget* menu_item = gtk_image_menu_item_new_with_label(
+        bookmark_utils::BuildMenuLabelFor(node).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);
 
     signals_.Connect(menu_item, "button-release-event",
                      G_CALLBACK(OnButtonReleasedThunk), this);
     if (node->is_url()) {
       signals_.Connect(menu_item, "activate",
                        G_CALLBACK(OnMenuItemActivatedThunk), this);
     } else if (node->is_folder()) {
@@ skipping 195 matching lines @@
 }
 
 void BookmarkMenuController::OnMenuItemDragGet(
     GtkWidget* widget, GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type, guint time) {
   const BookmarkNode* node = bookmark_utils::BookmarkNodeForWidget(widget);
   bookmark_utils::WriteBookmarkToSelection(node, selection_data, target_type,
                                            profile_);
 }