Readding UI test I pulled yesterday; hopefully the bots will like it more now...

chrome/browser/views/bookmark_bar_view.h

 // Copyright (c) 2006-2008 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 "chrome/browser/bookmark_bar_model.h"
 #include "chrome/browser/bookmark_drag_data.h"
 #include "chrome/common/slide_animation.h"
@@ skipping 117 matching lines @@
 
   // Returns true if the bookmarks bar preference is set to 'always show', we
   // use this as a shorthand way of knowing what style of bar to draw (if the
   // pref is set to false but we're painting, then we must be on the new tab
   // page).
   bool IsAlwaysShown();
 
   // True if we're supposed to draw the bookmarks bar in the new tab style.
   bool IsNewTabPage();
 
+  // Whether or not we are animating.
+  bool IsAnimating() { return size_animation_->IsAnimating(); }
+
   // SlideAnimationDelegate implementation.
   void AnimationProgressed(const Animation* animation);
   void AnimationEnded(const Animation* animation);
 
   // Returns the button at the specified index.
   ChromeViews::TextButton* GetBookmarkButton(int index);
 
   // Returns the button responsible for showing bookmarks in the other bookmark
   // folder.
   ChromeViews::TextButton* other_bookmarked_button() const {
@@ skipping 39 matching lines @@
         view_->show_folder_drop_menu_task_ = NULL;
         view_->ShowDropFolderForNode(node_);
       }
       // MessageLoop deletes us.
     }
 
    private:
     BookmarkBarView* view_;
     BookmarkBarNode* node_;
 
-    DISALLOW_EVIL_CONSTRUCTORS(ShowFolderDropMenuTask);
+    DISALLOW_COPY_AND_ASSIGN(ShowFolderDropMenuTask);
   };
 
   // Creates recent bookmark button and when visible button as well as
   // calculating the preferred height.
   void Init();
 
   // Creates the button showing the other bookmarked items.
   ChromeViews::MenuButton* CreateOtherBookmarkedButton();
 
   // Creates the button used when not all bookmark buttons fit.
@@ skipping 225 matching lines @@
   // 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.
   ChromeViews::BaseButton* throbbing_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBarView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_