summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmark_bar_folder_controller.h
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 15:34:54 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-20 15:34:54 +0000
commit1c7cddbefc63c30b54cda2722bee3c2732909f63 (patch)
tree76b9cfba6498e1c9ad60cc7d986435d136f7d3d9 /chrome/browser/cocoa/bookmark_bar_folder_controller.h
parenta977dac4d3827246bf037d2ced4332ec59fb835c (diff)
downloadchromium_src-1c7cddbefc63c30b54cda2722bee3c2732909f63.zip
chromium_src-1c7cddbefc63c30b54cda2722bee3c2732909f63.tar.gz
chromium_src-1c7cddbefc63c30b54cda2722bee3c2732909f63.tar.bz2
Prevent valgrind errors due to incomplete animations by providing a test setting to have animations ignored. Apply it to the BookmarkBarControllerTest.OffTheSideButtonHidden unit test. BookmarkBarController and BookmarkBarFolderController now have a -[setIgnoreAnimations:] function for accomplishing this.
BUG=44563 TEST=None Review URL: http://codereview.chromium.org/2095017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bar_folder_controller.h')
-rw-r--r--chrome/browser/cocoa/bookmark_bar_folder_controller.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.h b/chrome/browser/cocoa/bookmark_bar_folder_controller.h
index 09aaadf..cd48b56 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller.h
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.h
@@ -107,6 +107,10 @@
// We need to know the size of the vertical scrolling arrows so we
// can obscure/unobscure them.
CGFloat verticalScrollArrowHeight_;
+
+ // Set to YES to prevent any node animations. Useful for unit testing so that
+ // incomplete animations do not cause valgrind complaints.
+ BOOL ignoreAnimations_;
}
// Designated initializer.
@@ -158,6 +162,8 @@
- (id)folderTarget;
- (void)configureWindowLevel;
- (void)performOneScroll:(CGFloat)delta;
+// Set to YES in order to prevent animations.
+- (void)setIgnoreAnimations:(BOOL)ignore;
// Return YES if we can scroll up or down.
- (BOOL)canScrollUp;