Merge 33379 - Makes the chevron throb after a user sync'ed his bookmarks (if ...

chrome/browser/views/bookmark_bar_view.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_VIEWS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
 #include "app/slide_animation.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
@@ skipping 189 matching lines @@
   // Returns the position to anchor the menu for |button| at, the index of the
   // first child of the node to build the menu from.
   void GetAnchorPositionAndStartIndexForButton(
       views::MenuButton* button,
       views::MenuItemView::AnchorPosition* anchor,
       int* start_index);
 
   // Maximum size of buttons on the bookmark bar.
   static const int kMaxButtonWidth;
 
+  // If a button is currently throbbing, it is stopped. If immediate is true
+  // the throb stops immediately, otherwise it stops after a couple more
+  // throbs.
+  void StopThrobbing(bool immediate);
+
   // If true we're running tests. This short circuits a couple of animations.
   static bool testing_;
 
   // Constants used in Browser View, as well as here.
   // How inset the bookmarks bar is when displayed on the new tab page.
   static const int kNewtabHorizontalPadding;
   static const int kNewtabVerticalPadding;
 
  private:
   class ButtonSeparatorView;
@@ skipping 169 matching lines @@
                              const BookmarkDragData& data,
                              int* index,
                              bool* drop_on,
                              bool* is_over_overflow,
                              bool* is_over_other);
 
   // Returns the index of the first hidden bookmark button. If all buttons are
   // visible, this returns GetBookmarkButtonCount().
   int GetFirstHiddenNodeIndex();
 
-  // If the bookmark bubble is showing this determines which view should throb
-  // and starts it throbbing. Does nothing if bookmark bubble isn't showing.
-  void StartThrobbing();
-
-  // If a button is currently throbbing, it is stopped. If immediate is true
-  // the throb stops immediately, otherwise it stops after a couple more
-  // throbs.
-  void StopThrobbing(bool immediate);
+  // This determines which view should throb and starts it
+  // throbbing (e.g when the bookmark bubble is showing).
+  // If |overflow_only| is true, start throbbing only if |node| is hidden in
+  // the overflow menu.
+  void StartThrobbing(const BookmarkNode* node, bool overflow_only);
 
   // Updates the colors for all the child objects in the bookmarks bar.
   void UpdateColors();
 
   // This method computes the bounds for the bookmark bar items. If
   // |compute_bounds_only| = TRUE, the bounds for the items are just computed,
   // but are not set. This mode is used by GetPreferredSize() to obtain the
   // desired bounds. If |compute_bounds_only| = FALSE, the bounds are set.
   gfx::Size LayoutItems(bool compute_bounds_only);
 
@@ skipping 50 matching lines @@
   views::Label* instructions_;
 
   ButtonSeparatorView* bookmarks_separator_view_;
 
   // Owning browser. This is NULL during testing.
   Browser* browser_;
 
   // Animation controlling showing and hiding of the bar.
   scoped_ptr<SlideAnimation> size_animation_;
 
-  // If the bookmark bubble is showing, this is the URL.
-  GURL bubble_url_;
-
   // 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.
   views::CustomButton* throbbing_view_;
 
   // Background for extension toolstrips.
   SkBitmap toolstrip_background_;
 
   // Storage of strings needed for accessibility.
   std::wstring accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_