Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1440)

Unified Diff: chrome/browser/cocoa/download_started_animation_mac.mm

Issue 793003: Pick up a GTM roll and update the apis that changed in this roll.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/download_started_animation_mac.mm
===================================================================
--- chrome/browser/cocoa/download_started_animation_mac.mm (revision 41189)
+++ chrome/browser/cocoa/download_started_animation_mac.mm (working copy)
@@ -166,7 +166,8 @@
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 @@
[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 @@
// 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));
« no previous file with comments | « chrome/browser/cocoa/download_shelf_controller.mm ('k') | chrome/browser/cocoa/find_bar_cocoa_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698