Fix and simplify bookmark bar detach/attach animation.

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/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bubble_observer.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_controller_observer.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "components/bookmarks/browser/bookmark_node_data.h"
 #include "ui/gfx/animation/animation_delegate.h"
+#include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/context_menu_controller.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/menu/menu_types.h"
 #include "ui/views/drag_controller.h"
 
 class BookmarkBarViewObserver;
 class BookmarkBarViewTestHelper;
 class BookmarkContextMenu;
 class Browser;
 class BrowserView;
 class Profile;
 
 namespace bookmarks {
 class BookmarkModel;
 class ManagedBookmarkService;
 }
 
 namespace content {
 class PageNavigator;
 }
 
-namespace gfx {
-class SlideAnimation;
-}
-
 namespace views {
 class CustomButton;
 class MenuButton;
 class MenuItemView;
 class LabelButton;
 }
 
 // BookmarkBarView renders the BookmarkModel.  Each starred entry on the
 // BookmarkBar is rendered as a MenuButton. An additional MenuButton aligned to
 // the right allows the user to quickly see recently starred entries.
@@ skipping 34 matching lines @@
   // Sets whether the containing browser is showing an infobar.  This affects
   // layout during animation.
   void set_infobar_visible(bool infobar_visible) {
     infobar_visible_ = infobar_visible;
   }
 
   // Changes the state of the bookmark bar.
   void SetBookmarkBarState(BookmarkBar::State state,
                            BookmarkBar::AnimateChangeType animate_type);
 
-  // Whether or not we are animating.
-  bool is_animating();
-
   // If |loc| is over a bookmark button the node is returned corresponding to
   // the button and |model_start_index| is set to 0. If a overflow button is
   // showing and |loc| is over the overflow button, the bookmark bar node is
   // returned and |model_start_index| is set to the index of the first node
   // contained in the overflow menu.
   const bookmarks::BookmarkNode* GetNodeForButtonAtModelIndex(
       const gfx::Point& loc,
       int* model_start_index);
 
   // Returns the MenuButton for node.
   views::MenuButton* GetMenuButtonForNode(const bookmarks::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 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_; }
 
+  const gfx::Animation& size_animation() {
+    return size_animation_;
+  }
+
   // 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();
 
   // Returns the drop MenuItemView, or NULL if a menu isn't showing.
   views::MenuItemView* GetDropMenu();
 
   // 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);
 
   // Returns the tooltip text for the specified url and title. The returned
   // text is clipped to fit within the bounds of the monitor. |context| is
   // used to determine which gfx::Screen is used to retrieve bounds.
   //
   // Note that we adjust the direction of both the URL and the title based on
   // the locale so that pure LTR strings are displayed properly in RTL locales.
   static base::string16 CreateToolTipForURLAndTitle(const views::Widget* widget,
                                               const gfx::Point& screen_loc,
                                               const GURL& url,
                                               const base::string16& title,
                                               Profile* profile);
 
   // Returns true if Bookmarks Bar is currently detached from the Toolbar.
   bool IsDetached() const;
 
-  // Returns the current state of the resize animation (show/hide).
-  double GetAnimationValue() const;
-
   // Returns the current amount of overlap atop the browser toolbar.
   int GetToolbarOverlap() const;
 
   // views::View:
   gfx::Size GetPreferredSize() const override;
   gfx::Size GetMinimumSize() const override;
   bool CanProcessEventsWithinSubtree() const override;
   void Layout() override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
@@ skipping 265 matching lines @@
 
   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_;
+  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_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_;
 
   base::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_