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

11 files changed, 25 insertions, 11 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index 4122cbb..fc6474a 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -416,7 +416,8 @@ void AutocompletePopupViewMac::UpdatePopupAppearance() {
       r.size.width == oldFrame.size.width) {
     [NSAnimationContext beginGrouping];
     [[NSAnimationContext currentContext]
-        gtm_setDuration:kShrinkAnimationDuration];
+        gtm_setDuration:kShrinkAnimationDuration
+              eventMask:NSLeftMouseDownMask];
     [[popup_ animator] setFrame:r display:YES];
     [NSAnimationContext endGrouping];
   } else {
diff --git a/chrome/browser/cocoa/animatable_view.mm b/chrome/browser/cocoa/animatable_view.mm
index 0ca0f2e..99d65a6 100644
--- a/chrome/browser/cocoa/animatable_view.mm
+++ b/chrome/browser/cocoa/animatable_view.mm
@@ -29,6 +29,7 @@
        finalHeight:(CGFloat)height
           duration:(NSTimeInterval)duration {
   if ((self = [super gtm_initWithDuration:duration
+                                eventMask:NSLeftMouseDownMask
                            animationCurve:NSAnimationEaseIn])) {
     view_ = view;
     startHeight_ = [view_ height];
diff --git a/chrome/browser/cocoa/download_item_cell.mm b/chrome/browser/cocoa/download_item_cell.mm
index 1fbf74b..caa84f3 100644
--- a/chrome/browser/cocoa/download_item_cell.mm
+++ b/chrome/browser/cocoa/download_item_cell.mm
@@ -683,6 +683,7 @@ NSGradient* BackgroundTheme::GetNSGradient(int id) const {
                       duration:(NSTimeInterval)duration
                 animationCurve:(NSAnimationCurve)animationCurve {
   if ((self = [super gtm_initWithDuration:duration
+                                eventMask:NSLeftMouseDownMask
                            animationCurve:animationCurve])) {
     cell_ = cell;
     [self setAnimationBlockingMode:NSAnimationNonblocking];
diff --git a/chrome/browser/cocoa/download_shelf_controller.mm b/chrome/browser/cocoa/download_shelf_controller.mm
index 70b0b22..848d4f1 100644
--- a/chrome/browser/cocoa/download_shelf_controller.mm
+++ b/chrome/browser/cocoa/download_shelf_controller.mm
@@ -261,7 +261,8 @@ const NSTimeInterval kDownloadShelfCloseDuration = 0.12;
   frame.size.width = size.width;
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext]
-      gtm_setDuration:kDownloadItemOpenDuration];
+      gtm_setDuration:kDownloadItemOpenDuration
+            eventMask:NSLeftMouseDownMask];
   [[[controller view] animator] setFrame:frame];
   [NSAnimationContext endGrouping];
 
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));
diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
index 3d398ca..569455f 100644
--- a/chrome/browser/cocoa/find_bar_cocoa_controller.mm
+++ b/chrome/browser/cocoa/find_bar_cocoa_controller.mm
@@ -343,7 +343,8 @@ const float kFindBarCloseDuration = 0.15;
   currentAnimation_.reset(
       [[NSViewAnimation alloc]
         initWithViewAnimations:[NSArray arrayWithObjects:dict, nil]]);
-  [currentAnimation_ gtm_setDuration:duration];
+  [currentAnimation_ gtm_setDuration:duration
+                           eventMask:NSLeftMouseDownMask];
   [currentAnimation_ setDelegate:self];
   [currentAnimation_ startAnimation];
 }
diff --git a/chrome/browser/cocoa/fullscreen_controller.mm b/chrome/browser/cocoa/fullscreen_controller.mm
index 39e2cf5..5d657f9 100644
--- a/chrome/browser/cocoa/fullscreen_controller.mm
+++ b/chrome/browser/cocoa/fullscreen_controller.mm
@@ -66,6 +66,7 @@ const CGFloat kFloatingBarVerticalOffset = 22;
   CGFloat effectiveDuration = fabs(fullDuration * (fromFraction - toFraction));
 
   if ((self = [super gtm_initWithDuration:effectiveDuration
+                                eventMask:NSLeftMouseDownMask
                            animationCurve:animationCurve])) {
     startFraction_ = fromFraction;
     endFraction_ = toFraction;
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];
diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm
index 345d7dd..139e453 100644
--- a/chrome/browser/cocoa/preferences_window_controller.mm
+++ b/chrome/browser/cocoa/preferences_window_controller.mm
@@ -574,7 +574,8 @@ void PersonalDataManagerObserver::ShowAutoFillDialog(
     [animation_ setDelegate:self];
     // The default duration is 0.5s, which actually feels slow in here, so speed
     // it up a bit.
-    [animation_ gtm_setDuration:0.2];
+    [animation_ gtm_setDuration:0.2
+                      eventMask:NSLeftMouseDownMask];
     [animation_ setAnimationBlockingMode:NSAnimationNonblocking];
 
     // TODO(akalin): handle incognito profiles?  The windows version of this
diff --git a/chrome/browser/cocoa/status_bubble_mac.mm b/chrome/browser/cocoa/status_bubble_mac.mm
index c249a0d..460e43d 100644
--- a/chrome/browser/cocoa/status_bubble_mac.mm
+++ b/chrome/browser/cocoa/status_bubble_mac.mm
@@ -431,7 +431,8 @@ void StatusBubbleMac::Fade(bool show) {
 
   // This will cancel an in-progress transition and replace it with this fade.
   [NSAnimationContext beginGrouping];
-  [[NSAnimationContext currentContext] gtm_setDuration:duration];
+  [[NSAnimationContext currentContext] gtm_setDuration:duration
+                                             eventMask:NSLeftMouseDownMask];
   [[window_ animator] setAlphaValue:opacity];
   [NSAnimationContext endGrouping];
 }
diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm
index ef0bcfa..9a661e4 100644
--- a/chrome/browser/cocoa/tab_strip_controller.mm
+++ b/chrome/browser/cocoa/tab_strip_controller.mm
@@ -86,7 +86,8 @@ class ScopedNSAnimationContextGroup {
 
   void SetCurrentContextDuration(NSTimeInterval duration) {
     if (animate_) {
-      [[NSAnimationContext currentContext] gtm_setDuration:duration];
+      [[NSAnimationContext currentContext] gtm_setDuration:duration
+                                                 eventMask:NSLeftMouseDownMask];
     }
   }