Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
index 495fb28428398f3bb156898e2b8c7966b6a8672c..bd40b7eda7b56abf907130030d7912e25e13a898 100644 |
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm |
@@ -682,6 +682,7 @@ bool ToolbarActionsBarBridge::IsPopupRunning() const { |
kBrowserActionOriginYOffset, |
kChevronWidth, |
ToolbarActionsBar::IconHeight()); |
+ [chevronAnimation_ stopAnimation]; |
[chevronMenuButton_ setFrame:buttonFrame]; |
} |
@@ -722,19 +723,18 @@ bool ToolbarActionsBarBridge::IsPopupRunning() const { |
return; |
} |
- NSDictionary* animationDictionary; |
+ NSString* animationEffect; |
if (hidden) { |
- animationDictionary = [NSDictionary dictionaryWithObjectsAndKeys: |
- chevronMenuButton_.get(), NSViewAnimationTargetKey, |
- NSViewAnimationFadeOutEffect, NSViewAnimationEffectKey, |
- nil]; |
+ animationEffect = NSViewAnimationFadeOutEffect; |
} else { |
[chevronMenuButton_ setHidden:NO]; |
- animationDictionary = [NSDictionary dictionaryWithObjectsAndKeys: |
- chevronMenuButton_.get(), NSViewAnimationTargetKey, |
- NSViewAnimationFadeInEffect, NSViewAnimationEffectKey, |
- nil]; |
+ animationEffect = NSViewAnimationFadeInEffect; |
} |
+ NSDictionary* animationDictionary = |
+ [NSDictionary dictionaryWithObjectsAndKeys: |
+ chevronMenuButton_.get(), NSViewAnimationTargetKey, |
+ animationEffect, NSViewAnimationEffectKey, |
+ nil]; |
Avi (use Gerrit)
2014/11/20 00:46:48
NSDictionary* animationDictionary = @{
NSViewAni
Devlin
2014/11/20 21:13:02
ah, right, fancy new literals. Done.
|
[chevronAnimation_ setViewAnimations: |
[NSArray arrayWithObject:animationDictionary]]; |
[chevronAnimation_ startAnimation]; |