gtk: Cleanup BookmarkBarGtk class.

chrome/browser/gtk/bookmark_bar_gtk.h

 // Copyright (c) 2010 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_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 26 matching lines @@
 class SlideAnimation;
 class TabstripOriginProvider;
 
 class BookmarkBarGtk : public AnimationDelegate,
                        public ProfileSyncServiceObserver,
                        public BookmarkModelObserver,
                        public MenuBarHelper::Delegate,
                        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
   // recreates the models.
   void SetProfile(Profile* profile);
 
   // Returns the current profile.
   Profile* GetProfile() { return profile_; }
 
   // Returns the current browser.
@@ skipping 27 matching lines @@
 
   // Get the current height of the bookmark bar.
   int GetHeight();
 
   // Returns true if the bookmark bar is showing an animation.
   bool IsAnimating();
 
   // 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);
 
   // 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();
 
   // Sets the visibility of the instructional text based on whether there are
   // any bookmarks in the bookmark bar node.
   void SetInstructionState();
 
   // Sets the visibility of the overflow chevron.
   void SetChevronState();
 
@@ skipping 259 matching lines @@
   gfx::Point last_pressed_coordinates_;
 
   // The currently throbbing widget. This is NULL if no widget is throbbing.
   // We track it because we only want to allow one widget to throb at a time.
   GtkWidget* throbbing_widget_;
 
   ScopedRunnableMethodFactory<BookmarkBarGtk> method_factory_;
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_BAR_GTK_H_