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/download_started_animation_mac.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/download_started_animation_mac.mm')
| -rw-r--r-- | chrome/browser/cocoa/download_started_animation_mac.mm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/download_started_animation_mac.mm b/chrome/browser/cocoa/download_started_animation_mac.mm index 194632a..be66e99 100644 --- a/chrome/browser/cocoa/download_started_animation_mac.mm +++ b/chrome/browser/cocoa/download_started_animation_mac.mm @@ -166,7 +166,8 @@ private: NSPoint stop = NSMakePoint(0, imageHeight); [positionAnimation setFromValue:[NSValue valueWithPoint:start]]; [positionAnimation setToValue:[NSValue valueWithPoint:stop]]; - [positionAnimation gtm_setDuration:0.6]; + [positionAnimation gtm_setDuration:0.6 + eventMask:NSLeftMouseDownMask]; [positionAnimation setTimingFunction:mediaFunction]; // Opacity animation. @@ -174,7 +175,8 @@ private: [CABasicAnimation animationWithKeyPath:@"opacity"]; [opacityAnimation setFromValue:[NSNumber numberWithFloat:1.0]]; [opacityAnimation setToValue:[NSNumber numberWithFloat:0.4]]; - [opacityAnimation gtm_setDuration:0.6]; + [opacityAnimation gtm_setDuration:0.6 + eventMask:NSLeftMouseDownMask]; [opacityAnimation setTimingFunction:mediaFunction]; // Group the animations together. @@ -186,7 +188,8 @@ private: // Set self as delegate so self receives -animationDidStop:finished:; [animationGroup setDelegate:self]; [animationGroup setTimingFunction:mediaFunction]; - [animationGroup gtm_setDuration:0.6]; + [animationGroup gtm_setDuration:0.6 + eventMask:NSLeftMouseDownMask]; [layer addAnimation:animationGroup forKey:@"downloadOpacityAndPosition"]; observer_.reset(new DownloadAnimationTabObserver(self, tabContents)); |