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

chrome/browser/gtk/bookmark_bar_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_BAR_GTK_H_
 #define CHROME_BROWSER_GTK_BOOKMARK_BAR_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 59 matching lines @@
 
   // Alerts us that the theme changed, and we might need to change theme images.
   void UserChangedTheme(GtkThemeProperties* properties);
 
   // AnimationDelegate implementation ------------------------------------------
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
  private:
   // Helper function which generates GtkToolItems for |bookmark_toolbar_|.
-  void CreateAllBookmarkButtons(const BookmarkNode* node);
+  void CreateAllBookmarkButtons();
 
   // Sets the visibility of the instructional text based on whether there are
-  // any bookmarks in |node|. |node| is assumed to be the bookmarks bar node.
-  void SetInstructionState(const BookmarkNode* boomarks_bar_node);
+  // any bookmarks in the bookmark bar node.
+  void SetInstructionState();
 
   // Helper function which destroys all the bookmark buttons in the GtkToolbar.
   void RemoveAllBookmarkButtons();
 
   // Returns the number of buttons corresponding to starred urls/groups. This
   // is equivalent to the number of children the bookmark bar node from the
   // bookmark bar model has.
   int GetBookmarkButtonCount();
 
   // Overridden from BookmarkModelObserver:
 
-  // Invoked when the bookmark bar model has finished loading. Creates a button
+  // Invoked when the bookmark model has finished loading. Creates a button
   // for each of the children of the root node from the model.
   virtual void Loaded(BookmarkModel* model);
 
   // Invoked when the model is being deleted.
   virtual void BookmarkModelBeingDeleted(BookmarkModel* model);
 
   // Invoked when a node has moved.
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
@@ skipping 103 matching lines @@
 
   // A GtkLabel to display when there are no bookmark buttons to display.
   GtkWidget* instructions_;
 
   // GtkToolbar which contains all the bookmark buttons.
   OwnedWidgetGtk bookmark_toolbar_;
 
   // The other bookmarks button.
   GtkWidget* other_bookmarks_button_;
 
-  // The label inside |other_bookmarks_button_|. We keep a reference so we can
-  // change the text color.
-  GtkWidget* other_bookmarks_label_;
-
   // Whether we should ignore the next button release event (because we were
   // dragging).
   bool ignore_button_release_;
 
   // The BookmarkNode from the model being dragged. NULL when we aren't
   // dragging.
   const BookmarkNode* dragged_node_;
 
   // We create a GtkToolbarItem from |dragged_node_| for display.
   GtkToolItem* toolbar_drop_item_;
 
   // Whether we should show the instructional text in the bookmark bar.
   bool show_instructions_;
 
   // The last displayed right click menu, or NULL if no menus have been
   // displayed yet.
   scoped_ptr<BookmarkContextMenu> current_context_menu_;
 
   // The last displayed left click menu, or NULL if no menus have been
   // displayed yet.
   scoped_ptr<BookmarkMenuController> current_menu_;
 
   // Paints the background for our bookmark bar.
   scoped_ptr<NineBox> background_ninebox_;
 
   scoped_ptr<SlideAnimation> slide_animation_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_BAR_GTK_H_