bookmarks: Cleanup - Rename 'OtherBookmarked' to 'OtherBookmarks'.

chrome/browser/ui/views/bookmarks/bookmark_bar_view.h

 // Copyright (c) 2012 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_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_
 
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 102 matching lines @@
   const BookmarkNode* GetNodeForButtonAtModelIndex(const gfx::Point& loc,
                                                    int* model_start_index);
 
   // Returns the MenuButton for node.
   views::MenuButton* GetMenuButtonForNode(const BookmarkNode* node);
 
   // Returns the position to anchor the menu for |button| at.
   void GetAnchorPositionForButton(views::MenuButton* button,
                                   views::MenuAnchorPosition* anchor);
 
-  // Returns the button responsible for showing bookmarks in the other bookmark
-  // folder.
-  views::MenuButton* other_bookmarked_button() const {
-    return other_bookmarked_button_;
+  // Returns the button responsible for showing bookmarks in the
+  // "Other Bookmarks" folder.
+  views::MenuButton* other_bookmarks_button() const {
+    return other_bookmarks_button_;
   }
 
   // Returns the button used when not all the items on the bookmark bar fit.
   views::MenuButton* overflow_button() const { return overflow_button_; }
 
   // Returns the active MenuItemView, or NULL if a menu isn't showing.
   views::MenuItemView* GetMenu();
 
   // Returns the context menu, or null if one isn't showing.
   views::MenuItemView* GetContextMenu();
@@ skipping 146 matching lines @@
   views::LabelButton* GetBookmarkButton(int index);
 
   // Returns BOOKMARK_LAUNCH_LOCATION_DETACHED_BAR or
   // BOOKMARK_LAUNCH_LOCATION_ATTACHED_BAR based on detached state.
   BookmarkLaunchLocation GetBookmarkLaunchLocation() const;
 
   // Returns the index of the first hidden bookmark button. If all buttons are
   // visible, this returns GetBookmarkButtonCount().
   int GetFirstHiddenNodeIndex();
 
-  // Creates the button showing the other bookmarked items.
-  views::MenuButton* CreateOtherBookmarkedButton();
+  // Creates the button showing the "Other Bookmarks" folder.
+  views::MenuButton* CreateOtherBookmarksButton();
 
-  // Creates the button showing the managed bookmarks items.
+  // Creates the button showing the "Managed Bookmarks" folder.
   views::MenuButton* CreateManagedBookmarksButton();
 
   // Creates the button used when not all bookmark buttons fit.
   views::MenuButton* CreateOverflowButton();
 
   // Creates the button for rendering the specified bookmark node.
   views::View* CreateBookmarkButton(const BookmarkNode* node);
 
   // Creates the button for rendering the apps page shortcut.
   views::LabelButton* CreateAppsPageShortcutButton();
@@ skipping 45 matching lines @@
   // Returns the view to throb when a node is removed. |parent| is the parent of
   // the node that was removed, and |old_index| the index of the node that was
   // removed.
   views::CustomButton* DetermineViewToThrobFromRemove(
       const BookmarkNode* parent,
       int old_index);
 
   // Updates the colors for all the child objects in the bookmarks bar.
   void UpdateColors();
 
-  // Updates the visibility of |other_bookmarked_button_| and
+  // Updates the visibility of |other_bookmarks_button_| and
   // |managed_bookmarks_button_|. Also shows or hides the separator if required.
   // Returns true if something changed and a LayoutAndPaint() is needed.
   bool UpdateOtherAndManagedButtonsVisibility();
 
   // Updates the visibility of |bookmarks_separator_view_|.
   void UpdateBookmarksSeparatorVisibility();
 
   // Updates the visibility of the apps shortcut based on the pref value.
   void OnAppsPageShortcutVisibilityPrefChanged();
 
@@ skipping 23 matching lines @@
 
   // Used when showing a menu for drag and drop. That is, if the user drags
   // over a folder this becomes non-null and manages the menu showing the
   // contents of the node.
   BookmarkMenuController* bookmark_drop_menu_;
 
   // If non-NULL we're showing a context menu for one of the items on the
   // bookmark bar.
   scoped_ptr<BookmarkContextMenu> context_menu_;
 
-  // Shows the other bookmark entries.
-  views::MenuButton* other_bookmarked_button_;
+  // Shows the "Other Bookmarks" folder button.
+  views::MenuButton* other_bookmarks_button_;
 
   // Shows the managed bookmarks entries.
   views::MenuButton* managed_bookmarks_button_;
 
   // Shows the Apps page shortcut.
   views::LabelButton* apps_page_shortcut_;
 
   // Used to track drops on the bookmark bar view.
   scoped_ptr<DropInfo> drop_info_;
 
   // Visible if not all the bookmark buttons fit.
   views::MenuButton* overflow_button_;
 
   // Shows a text and a link to import bookmarks if there are no bookmarks in
   // the Bookmarks Bar.
   views::View* instructions_;
 
   ButtonSeparatorView* bookmarks_separator_view_;
 
   Browser* browser_;
   BrowserView* browser_view_;
 
   // True if the owning browser is showing an infobar.
   bool infobar_visible_;
 
   // Animation controlling showing and hiding of the bar.
   scoped_ptr<gfx::SlideAnimation> size_animation_;
 
   // If the bookmark bubble is showing, this is the visible ancestor of the URL.
-  // The visible ancestor is either the other_bookmarked_button_,
-  // overflow_button_ or a button on the bar.
+  // The visible ancestor is either the |other_bookmarks_button_|,
+  // |overflow_button_| or a button on the bar.
   views::CustomButton* throbbing_view_;
 
   BookmarkBar::State bookmark_bar_state_;
 
   // Are we animating to or from the detached state?
   bool animating_detached_;
 
   ObserverList<BookmarkBarViewObserver> observers_;
 
   // Factory used to delay showing of the drop menu.
   base::WeakPtrFactory<BookmarkBarView> show_folder_method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_BAR_VIEW_H_