Don't pack an empty label into bookmarks with empty titles.

chrome/browser/gtk/bookmark_utils_gtk.cc

 // Copyright (c) 2009 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/gtk/bookmark_utils_gtk.h"
 
 #include "app/resource_bundle.h"
 #include "base/gfx/gtk_util.h"
 #include "base/pickle.h"
 #include "base/string_util.h"
@@ skipping 110 matching lines @@
   std::string tooltip = BuildTooltipFor(node);
   if (!tooltip.empty())
     gtk_widget_set_tooltip_text(button, tooltip.c_str());
 
   // We pack the button manually (rather than using gtk_button_set_*) so that
   // we can have finer control over its label.
   GdkPixbuf* pixbuf = bookmark_utils::GetPixbufForNode(node, model);
   GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf);
   g_object_unref(pixbuf);
 
-  GtkWidget* label = gtk_label_new(WideToUTF8(node->GetTitle()).c_str());
-  gtk_label_set_max_width_chars(GTK_LABEL(label), kMaxCharsOnAButton);
-  gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
-
   GtkWidget* box = gtk_hbox_new(FALSE, kBarButtonPadding);
   gtk_box_pack_start(GTK_BOX(box), image, FALSE, FALSE, 0);
-  gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+
+  std::string label_string = WideToUTF8(node->GetTitle());
+  if (!label_string.empty()) {
+    GtkWidget* label = gtk_label_new(label_string.c_str());
+    gtk_label_set_max_width_chars(GTK_LABEL(label), kMaxCharsOnAButton);
+    gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);
+    gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0);
+    SetButtonTextColors(label, provider);
+  }
 
   GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
-  gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
-      kButtonPaddingTop, kButtonPaddingBottom,
-      kButtonPaddingLeft, kButtonPaddingRight);
+  // If we are not showing the label, don't set any padding, so that the icon
+  // will just be centered.
+  if (label_string.c_str()) {
+    gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),
+        kButtonPaddingTop, kButtonPaddingBottom,
+        kButtonPaddingLeft, kButtonPaddingRight);
+  }
   gtk_container_add(GTK_CONTAINER(alignment), box);
   gtk_container_add(GTK_CONTAINER(button), alignment);
 
-  SetButtonTextColors(label, provider);
   g_object_set_data(G_OBJECT(button), bookmark_utils::kBookmarkNode,
                     AsVoid(node));
 
   gtk_widget_show_all(alignment);
 }
 
 std::string BuildTooltipFor(const BookmarkNode* node) {
   // TODO(erg): Actually build the tooltip. For now, we punt and just return
   // the URL.
   return node->GetURL().possibly_invalid_spec();
@@ skipping 128 matching lines @@
     GURL url(uris[i]);
     std::string title = GetNameForURL(url);
     model->AddURL(parent, idx++, UTF8ToWide(title), url);
   }
 
   g_strfreev(uris);
   return true;
 }
 
 }  // namespace bookmark_utils