Index: chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
index cc0cc76fd28091fcce7f9f5dbb5f085c77741c3f..364bf2a76af43654e79df54fc20dbc0741621d28 100644 |
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm |
@@ -227,7 +227,8 @@ const NSSize kHoverCloseButtonDefaultSize = { 18, 18 }; |
} |
- (void)showDownloadShelf:(BOOL)show |
- isUserAction:(BOOL)isUserAction { |
+ isUserAction:(BOOL)isUserAction |
+ animate:(BOOL)animate { |
[self cancelAutoClose]; |
shouldCloseOnMouseExit_ = NO; |
@@ -251,11 +252,11 @@ const NSSize kHoverCloseButtonDefaultSize = { 18, 18 }; |
// do no animation over janky animation. Find a way to make animating in |
// smoother. |
AnimatableView* view = [self animatableView]; |
- if (show) { |
- [view setHeight:maxShelfHeight_]; |
- [view setHidden:NO]; |
- } else { |
+ if (animate && !show) { |
[view animateToNewHeight:0 duration:kDownloadShelfCloseDuration]; |
+ } else { |
+ [view setHeight:show ? maxShelfHeight_ : 0]; |
+ [view setHidden:!show]; |
} |
barIsVisible_ = show; |