diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 18:39:13 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 18:39:13 +0000 |
commit | 933d1300f682b87408cd16fea691ec717c65580b (patch) | |
tree | 83b7d51e8a9bc7025d7a5a5c7f0a6e69385834ad /chrome/browser/cocoa/info_bubble_window.mm | |
parent | e8dbd674b68f0261498ae901c0805278a0c7bea1 (diff) | |
download | chromium_src-933d1300f682b87408cd16fea691ec717c65580b.zip chromium_src-933d1300f682b87408cd16fea691ec717c65580b.tar.gz chromium_src-933d1300f682b87408cd16fea691ec717c65580b.tar.bz2 |
Pick up a GTM roll and update the apis that changed in this roll.
BUG=none
TEST=everything still works
Review URL: http://codereview.chromium.org/793003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/info_bubble_window.mm')
-rw-r--r-- | chrome/browser/cocoa/info_bubble_window.mm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/info_bubble_window.mm b/chrome/browser/cocoa/info_bubble_window.mm index ebfe94c..d803ad5 100644 --- a/chrome/browser/cocoa/info_bubble_window.mm +++ b/chrome/browser/cocoa/info_bubble_window.mm @@ -123,7 +123,8 @@ const NSTimeInterval kMinimumTimeInterval = // Apply animations to hide self. [NSAnimationContext beginGrouping]; [[NSAnimationContext currentContext] - gtm_setDuration:kOrderOutAnimationDuration]; + gtm_setDuration:kOrderOutAnimationDuration + eventMask:NSLeftMouseDownMask]; [[self animator] setAlphaValue:0.0]; [NSAnimationContext endGrouping]; } @@ -170,7 +171,8 @@ const NSTimeInterval kMinimumTimeInterval = // Apply animations to show and move self. [NSAnimationContext beginGrouping]; [[NSAnimationContext currentContext] - gtm_setDuration:kOrderInAnimationDuration]; + gtm_setDuration:kOrderInAnimationDuration + eventMask:NSLeftMouseDownMask]; [[self animator] setAlphaValue:1.0]; [[self animator] setFrame:frame display:YES]; [NSAnimationContext endGrouping]; |