Clean up some bookmark related hacks.

chrome/browser/gtk/bookmark_utils_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_GTK_BOOKMARK_UTILS_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_UTILS_GTK_H_
 
 #include <gtk/gtk.h>
 #include <vector>
 #include <string>
 
 class BookmarkModel;
 class BookmarkNode;
 class Profile;
 
 namespace bookmark_utils {
 
 extern const char kBookmarkNode[];
 
+// Padding between the image and the label of a bookmark bar button.
+extern const int kBarButtonPadding;
+
 // These functions do not add a ref to the returned pixbuf, and it should not be
 // unreffed.
 GdkPixbuf* GetFolderIcon();
 GdkPixbuf* GetDefaultFavicon();
 
 // Get the image that is used to represent the node. This function adds a ref
 // to the returned pixbuf, so it requires a matching call to g_object_unref().
 GdkPixbuf* GetPixbufForNode(const BookmarkNode* node, BookmarkModel* model);
 
 // Returns a GtkWindow with a visual hierarchy for passing to
 // gtk_drag_set_icon_widget().
 GtkWidget* GetDragRepresentation(const BookmarkNode* node,
                                  BookmarkModel* model);
 
 // Helper function that sets visual properties of GtkButton |button| to the
 // contents of |node|.
 void ConfigureButtonForNode(const BookmarkNode* node, BookmarkModel* model,
                             GtkWidget* button);
 
 // Returns the tooltip.
 std::string BuildTooltipFor(const BookmarkNode* node);
 
 // Returns the "bookmark-node" property of |widget| casted to the correct type.
 const BookmarkNode* BookmarkNodeForWidget(GtkWidget* widget);
 
 // This function is a temporary hack to fix fonts on dark system themes.
-// NOTE: this makes assumptions about GtkButton internals. Also, it only works
-// if you call it after the last time you edit the button.
 // TODO(estade): remove this function.
-void SetButtonTextColors(GtkWidget* button);
+void SetButtonTextColors(GtkWidget* label);
 
 // Drag and drop. --------------------------------------------------------------
 
 // Pickle a node into a GtkSelection.
 void WriteBookmarkToSelection(const BookmarkNode* node,
                               GtkSelectionData* selection_data,
                               guint target_type,
                               Profile* profile);
 
 // Pickle a vector of nodes into a GtkSelection.
 void WriteBookmarksToSelection(const std::vector<const BookmarkNode*>& nodes,
                                GtkSelectionData* selection_data,
                                guint target_type,
                                Profile* profile);
 
 // Un-pickle node(s) from a GtkSelection.
 // The last two arguments are out parameters.
 std::vector<const BookmarkNode*> GetNodesFromSelection(
     GdkDragContext* context,
     GtkSelectionData* selection_data,
     guint target_type,
     Profile* profile,
     gboolean* delete_selection_data,
     gboolean* dnd_success);
 
 }  // namespace bookmark_utils
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_UTILS_GTK_H_