Clean up some bookmark related hacks.

chrome/browser/gtk/bookmark_bar_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_bar_gtk.h"
 
 #include <vector>
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
@@ skipping 132 matching lines @@
   g_signal_connect(bookmark_toolbar_.get(), "drag-drop",
                    G_CALLBACK(&OnToolbarDragDrop), this);
   g_signal_connect(bookmark_toolbar_.get(), "drag-data-received",
                    G_CALLBACK(&OnToolbarDragReceived), this);
   g_signal_connect(bookmark_toolbar_.get(), "button-press-event",
                    G_CALLBACK(&OnButtonPressed), this);
 
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_.get()), gtk_vseparator_new(),
                      FALSE, FALSE, 0);
 
+  // We pack the button manually (rather than using gtk_button_set_*) so that
+  // we can have finer control over its label.
   other_bookmarks_button_ = gtk_chrome_button_new();
   ConnectFolderButtonEvents(other_bookmarks_button_);
-  gtk_button_set_label(
-      GTK_BUTTON(other_bookmarks_button_),
+
+  GtkWidget* image = gtk_image_new_from_pixbuf(folder_icon);
+  GtkWidget* label = gtk_label_new(
       l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_OTHER_BOOKMARKED).c_str());
-  gtk_button_set_image(GTK_BUTTON(other_bookmarks_button_),
-                       gtk_image_new_from_pixbuf(folder_icon));
-  // Set the proper text colors.
-  bookmark_utils::SetButtonTextColors(other_bookmarks_button_);
+  bookmark_utils::SetButtonTextColors(label);
+
+  GtkWidget* box = gtk_hbox_new(FALSE, bookmark_utils::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(other_bookmarks_button_), box);
 
   gtk_box_pack_start(GTK_BOX(bookmark_hbox_.get()), other_bookmarks_button_,
                      FALSE, FALSE, 0);
   gtk_widget_set_size_request(bookmark_hbox_.get(), -1, 0);
 
   slide_animation_.reset(new SlideAnimation(this));
 }
 
 void BookmarkBarGtk::AddBookmarkbarToBox(GtkWidget* box) {
   gtk_box_pack_start(GTK_BOX(box), bookmark_hbox_.get(), FALSE, FALSE, 0);
@@ skipping 569 matching lines @@
   bar->InitBackground();
   gfx::Point tabstrip_origin =
       bar->window_->tabstrip()->GetTabStripOriginForWidget(widget);
   bar->background_ninebox_->RenderTopCenterStrip(
       cr, tabstrip_origin.x(), tabstrip_origin.y(),
       event->area.x + event->area.width - tabstrip_origin.x());
   cairo_destroy(cr);
 
   return FALSE;  // Propagate expose to children.
 }