[Mac] Prep for animating the Browser Action Buttons in and out....

chrome/browser/cocoa/toolbar_controller.mm

 // Copyright (c) 2010 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/cocoa/toolbar_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util_mac.h"
 #include "base/mac_util.h"
@@ skipping 653 matching lines @@
   [self adjustLocationAndGoPositionsBy:
       [browserActionsContainerView_ resizeDeltaX] animate:NO];
 }
 
 - (void)browserActionsContainerDragFinished:(NSNotification*)notification {
   [browserActionsController_ resizeContainerAndAnimate:YES];
   [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
-  [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:NO];
+  [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:
+      [[[self view] window] isVisible]];
 }
 
 - (void)pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
   CGFloat goXPos = [goButton_ frame].origin.x + NSWidth([goButton_ frame]);
   CGFloat leftPadding;
 
   if ([browserActionsContainerView_ isHidden]) {
-    leftPadding = NSWidth([[goButton_ window] frame]) - goXPos;
+    CGFloat edgeXPos = [pageButton_ isHidden] ?
+        NSWidth([[goButton_ window] frame]) : [pageButton_ frame].origin.x;
+    leftPadding = edgeXPos - goXPos;
   } else {
     NSRect containerFrame = animate ?
         [browserActionsContainerView_ animationEndFrame] :
         [browserActionsContainerView_ frame];
 
     leftPadding = containerFrame.origin.x - goXPos;
   }
   if (leftPadding != kBrowserActionsContainerLeftPadding) {
     CGFloat dX = leftPadding - kBrowserActionsContainerLeftPadding;
     [self adjustLocationAndGoPositionsBy:dX animate:animate];
@@ skipping 202 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end