gtk: Cleanup BookmarkBarGtk class.

chrome/browser/gtk/bookmark_bar_gtk.h

Index: chrome/browser/gtk/bookmark_bar_gtk.h
diff --git a/chrome/browser/gtk/bookmark_bar_gtk.h b/chrome/browser/gtk/bookmark_bar_gtk.h
index 0939c707023fdbebae354d129613a9745ae0c3c2..0120f71dcf3f7394cb4b2cf6c278159d73afbfa6 100644
--- a/chrome/browser/gtk/bookmark_bar_gtk.h
+++ b/chrome/browser/gtk/bookmark_bar_gtk.h
@@ -44,14 +44,11 @@ class BookmarkBarGtk : public AnimationDelegate,
                        public NotificationObserver,
                        public BookmarkBarInstructionsGtk::Delegate,
                        public BookmarkContextMenuControllerDelegate {
-  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty);
-  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest,
-                           HidesHelpMessageWithBookmark);
-  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, BuildsButtons);
  public:
-  explicit BookmarkBarGtk(BrowserWindowGtk* window,
-                          Profile* profile, Browser* browser,
-                          TabstripOriginProvider* tabstrip_origin_provider);
+  BookmarkBarGtk(BrowserWindowGtk* window,
+                 Profile* profile,
+                 Browser* browser,
+                 TabstripOriginProvider* tabstrip_origin_provider);
   virtual ~BookmarkBarGtk();
 
   // Resets the profile. This removes any buttons for the current profile and
@@ -99,11 +96,11 @@ class BookmarkBarGtk : public AnimationDelegate,
   // Returns true if the bookmarks bar preference is set to 'always show'.
   bool IsAlwaysShown();
 
-  // AnimationDelegate implementation ------------------------------------------
+  // Overridden from AnimationDelegate:

[Evan Stade, 2010/12/28 20:46:52]

was there some decree I missed that this is the preferred style?

[tfarina, 2010/12/28 20:51:14]

Nope, I just use it everywhere. There are two other forms without the "----" in
the end that I have seen, which is methods and implementation(s). If you are
strong about this I will revert this particular change, although I really have a
preference for using "Overridden...".

   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
-  // MenuBarHelper::Delegate implementation ------------------------------------
+  // Overridden from MenuBarHelper::Delegate:
   virtual void PopupForButton(GtkWidget* button);
   virtual void PopupForButtonNextTo(GtkWidget* button,
                                     GtkMenuDirectionType dir);
@@ -111,10 +108,15 @@ class BookmarkBarGtk : public AnimationDelegate,
   // The NTP needs to have access to this.
   static const int kBookmarkBarNTPHeight;
 
-  // BookmarkContextMenuController::Delegate implementation --------------------
+  // Overridden from BookmarkContextMenuController::Delegate:
   virtual void CloseMenu();
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, DisplaysHelpMessageOnEmpty);
+  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest,
+                           HidesHelpMessageWithBookmark);
+  FRIEND_TEST_ALL_PREFIXES(BookmarkBarGtkUnittest, BuildsButtons);
+
   // Helper function which generates GtkToolItems for |bookmark_toolbar_|.
   void CreateAllBookmarkButtons();