[Extensions Toolbar Mac] Fix chevron position after animation

chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 
 #include <cmath>
 #include <string>
 
 #include "base/strings/sys_string_conversions.h"
@@ skipping 664 matching lines @@
                  inFrame:frame
                  animate:animate];
 }
 
 - (void)updateChevronPositionInFrame:(NSRect)frame {
   CGFloat xPos = NSWidth(frame) - kChevronWidth;
   NSRect buttonFrame = NSMakeRect(xPos,
                                   kBrowserActionOriginYOffset,
                                   kChevronWidth,
                                   ToolbarActionsBar::IconHeight());
+  [chevronAnimation_ stopAnimation];
   [chevronMenuButton_ setFrame:buttonFrame];
 }
 
 - (void)setChevronHidden:(BOOL)hidden
                  inFrame:(NSRect)frame
                  animate:(BOOL)animate {
   if (hidden == [self chevronIsHidden])
     return;
 
   if (!chevronMenuButton_.get()) {
@@ skipping 20 matching lines @@
   [self updateChevronPositionInFrame:frame];
 
   // Stop any running animation.
   [chevronAnimation_ stopAnimation];
 
   if (!animate) {
     [chevronMenuButton_ setHidden:hidden];
     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 = @{
  NSViewAnimationTargetKey : chevronMenuButton_.get(),
  NSViewAnimationEffectKey : animationEffect
};

[Devlin, 2014/11/20 21:13:02]

ah, right, fancy new literals.  Done.

   [chevronAnimation_ setViewAnimations:
       [NSArray arrayWithObject:animationDictionary]];
   [chevronAnimation_ startAnimation];
 }
 
 - (void)chevronItemSelected:(id)menuItem {
   [self browserActionClicked:[menuItem representedObject]];
 }
 
 - (void)updateGrippyCursors {
@@ skipping 11 matching lines @@
 
 - (BrowserActionButton*)buttonWithIndex:(NSUInteger)index {
   const std::vector<ToolbarActionViewController*>& toolbar_actions =
       toolbarActionsBar_->toolbar_actions();
   if (index < toolbar_actions.size())
     return [self buttonForId:toolbar_actions[index]->GetId()];
   return nil;
 }
 
 @end