| Index: chrome/browser/ui/cocoa/info_bubble_window.mm
|
| diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm
|
| index 31bcc3c0bcb952f60770a775657d842dd89bb6ed..a0b0270522a3152239bdd42f7bd591184320b6a3 100644
|
| --- a/chrome/browser/ui/cocoa/info_bubble_window.mm
|
| +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
|
| @@ -96,6 +96,7 @@ class AppNotificationBridge : public content::NotificationObserver {
|
|
|
| @synthesize delayOnClose = delayOnClose_;
|
| @synthesize canBecomeKeyWindow = canBecomeKeyWindow_;
|
| +@synthesize enableAnimations = enableAnimations_;
|
|
|
| - (id)initWithContentRect:(NSRect)contentRect
|
| styleMask:(NSUInteger)aStyle
|
| @@ -111,6 +112,7 @@ class AppNotificationBridge : public content::NotificationObserver {
|
| [self setHasShadow:YES];
|
| delayOnClose_ = YES;
|
| canBecomeKeyWindow_ = YES;
|
| + enableAnimations_ = YES;
|
| notificationBridge_.reset(new AppNotificationBridge(self));
|
|
|
| // Start invisible. Will be made visible when ordered front.
|
| @@ -158,7 +160,8 @@ class AppNotificationBridge : public content::NotificationObserver {
|
| // Apply animations to hide self.
|
| [NSAnimationContext beginGrouping];
|
| [[NSAnimationContext currentContext]
|
| - gtm_setDuration:kOrderOutAnimationDuration
|
| + gtm_setDuration:enableAnimations_ ? kOrderOutAnimationDuration :
|
| + kMinimumTimeInterval
|
| eventMask:NSLeftMouseUpMask];
|
| [[self animator] setAlphaValue:0.0];
|
| [NSAnimationContext endGrouping];
|
| @@ -207,7 +210,8 @@ class AppNotificationBridge : public content::NotificationObserver {
|
| [NSAnimationContext beginGrouping];
|
| // The star currently triggers on mouse down, not mouse up.
|
| [[NSAnimationContext currentContext]
|
| - gtm_setDuration:kOrderInAnimationDuration
|
| + gtm_setDuration:enableAnimations_ ? kOrderInAnimationDuration :
|
| + kMinimumTimeInterval
|
| eventMask:NSLeftMouseUpMask|NSLeftMouseDownMask];
|
| [[self animator] setAlphaValue:1.0];
|
| [[self animator] setFrame:frame display:YES];
|
|
|