A little bit of bookmark bar cleanup, a little bit of padding improvement....

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 12 matching lines @@
 // Used in gtk_selection_data_set(). (I assume from this parameter that gtk has
 // to some really exotic hardware...)
 const int kBitsInAByte = 8;
 
 // Maximum number of characters on a bookmark button.
 const size_t kMaxCharsOnAButton = 15;
 
 // Only used for the background of the drag widget.
 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xe6, 0xed, 0xf4);
 
+// Padding between the chrome button highlight border and the contents (favicon,
+// text).
+// TODO(estade): we need to adjust the top and bottom padding, but first we need
+// to give the bookmark bar more space (at the expense of the toolbar).
+const int kButtonPaddingTop = 0;
+const int kButtonPaddingBottom = 0;
+const int kButtonPaddingLeft = 2;
+const int kButtonPaddingRight = 0;
+
 void* AsVoid(const BookmarkNode* node) {
   return const_cast<BookmarkNode*>(node);
 }
 
 }  // namespace
 
 namespace bookmark_utils {
 
 const char kBookmarkNode[] = "bookmark-node";
 
+// Spacing between the buttons on the bar.
 const int kBarButtonPadding = 4;
 
 GdkPixbuf* GetFolderIcon() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   static GdkPixbuf* default_folder_icon = rb.GetPixbufNamed(
       IDR_BOOKMARK_BAR_FOLDER);
   return default_folder_icon;
 }
 
 GdkPixbuf* GetDefaultFavicon() {
@@ skipping 63 matching lines @@
   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);
-  gtk_container_add(GTK_CONTAINER(button), box);
+
+  GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
+  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, properties);
   g_object_set_data(G_OBJECT(button), bookmark_utils::kBookmarkNode,
                     AsVoid(node));
 
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(button),
                                           properties->use_gtk_rendering);
 
-  gtk_widget_show_all(box);
+  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();
 }
 
 const BookmarkNode* BookmarkNodeForWidget(GtkWidget* widget) {
   return reinterpret_cast<const BookmarkNode*>(
@@ skipping 95 matching lines @@
       default: {
         DLOG(ERROR) << "Unsupported drag received type: " << target_type;
       }
     }
   }
 
   return std::vector<const BookmarkNode*>();
 }
 
 }  // namespace bookmark_utils