Merge 54188 - [Mac] First pass at final sizing of toolbar items....

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 "app/menus/accelerator_cocoa.h"
@@ skipping 503 matching lines @@
   if (hide == [homeButton_ isHidden])
     return;  // Nothing to do, view state matches pref state.
 
   // Always shift the text field by the width of the home button minus one pixel
   // since the frame edges of each button are right on top of each other. When
   // hiding the button, reverse the direction of the movement (to the left).
   CGFloat moveX = [homeButton_ frame].size.width - 1.0;
   if (hide)
     moveX *= -1;  // Reverse the direction of the move.
 
-  [reloadButton_ setFrame:NSOffsetRect([reloadButton_ frame], moveX, 0)];
   [locationBar_ setFrame:[self adjustRect:[locationBar_ frame]
                                  byAmount:moveX]];
   [homeButton_ setHidden:hide];
 }
 
 // Install the menu wrench buttons. Calling this repeatedly is inexpensive so it
 // can be done every time the buttons are shown.
 - (void)installWrenchMenu {
   if (wrenchMenuModel_.get())
     return;
@@ skipping 248 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end