| Index: chrome/browser/cocoa/toolbar_controller.mm
|
| ===================================================================
|
| --- chrome/browser/cocoa/toolbar_controller.mm (revision 43254)
|
| +++ chrome/browser/cocoa/toolbar_controller.mm (working copy)
|
| @@ -671,7 +671,8 @@
|
| }
|
|
|
| - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
|
| - [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:NO];
|
| + [self pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:
|
| + [[[self view] window] isVisible]];
|
| }
|
|
|
| - (void)pinGoButtonToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
|
| @@ -679,7 +680,9 @@
|
| 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] :
|
|
|