[Mac] UI changes for the Browser Actions toolbar container....

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 37 matching lines @@
 NSString* const kBackButtonImageName = @"back_Template.pdf";
 NSString* const kForwardButtonImageName = @"forward_Template.pdf";
 NSString* const kReloadButtonReloadImageName = @"reload_Template.pdf";
 NSString* const kReloadButtonStopImageName = @"stop_Template.pdf";
 NSString* const kHomeButtonImageName = @"home_Template.pdf";
 NSString* const kWrenchButtonImageName = @"menu_chrome_Template.pdf";
 
 // Height of the toolbar in pixels when the bookmark bar is closed.
 const CGFloat kBaseToolbarHeight = 36.0;
 
-// The distance from the location bar to the Browser Actions container
-// in pixels.
-const CGFloat kBrowserActionsContainerLeftPadding = 5.0;
-
 // The minimum width of the location bar in pixels.
 const CGFloat kMinimumLocationBarWidth = 100.0;
 
 // The duration of any animation that occurs within the toolbar in seconds.
 const CGFloat kAnimationDuration = 0.2;
 
 }  // namespace
 
 @interface ToolbarController(Private)
 - (void)addAccessibilityDescriptions;
@@ skipping 479 matching lines @@
     [[NSNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(adjustBrowserActionsContainerForNewWindow:)
                name:NSWindowDidBecomeKeyNotification
              object:[[self view] window]];
   }
   CGFloat containerWidth = [browserActionsContainerView_ isHidden] ? 0.0 :
       NSWidth([browserActionsContainerView_ frame]);
   if (containerWidth > 0.0)
     [self adjustLocationSizeBy:(containerWidth * -1) animate:NO];
-  // Right border should always be visible because wrench menu can no longer
-  // hide.
-  [browserActionsContainerView_ setRightBorderShown:YES];
 }
 
 - (void)adjustBrowserActionsContainerForNewWindow:
     (NSNotification*)notification {
   [self toolbarFrameChanged];
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidBecomeKeyNotification
               object:[[self view] window]];
 }
@@ skipping 11 matching lines @@
   [browserActionsController_ resizeContainerAndAnimate:YES];
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:YES];
 }
 
 - (void)browserActionsVisibilityChanged:(NSNotification*)notification {
   [self pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:NO];
 }
 
 - (void)pinLocationBarToLeftOfBrowserActionsContainerAndAnimate:(BOOL)animate {
   CGFloat locationBarXPos = NSMaxX([locationBar_ frame]);
-  CGFloat leftPadding;
+  CGFloat leftDistance;
 
   if ([browserActionsContainerView_ isHidden]) {
     CGFloat edgeXPos = [wrenchButton_ frame].origin.x;
-    leftPadding = edgeXPos - locationBarXPos;
+    leftDistance = edgeXPos - locationBarXPos;
   } else {
     NSRect containerFrame = animate ?
         [browserActionsContainerView_ animationEndFrame] :
         [browserActionsContainerView_ frame];
 
-    leftPadding = containerFrame.origin.x - locationBarXPos;
+    leftDistance = containerFrame.origin.x - locationBarXPos;
   }
-  if (leftPadding != kBrowserActionsContainerLeftPadding) {
-    CGFloat dX = leftPadding - kBrowserActionsContainerLeftPadding;
-    [self adjustLocationSizeBy:dX animate:animate];
-  }
+  if (leftDistance != 0.0)
+    [self adjustLocationSizeBy:leftDistance animate:animate];
 }
 
 - (void)maintainMinimumLocationBarWidth {
   CGFloat locationBarWidth = NSWidth([locationBar_ frame]);
   locationBarAtMinSize_ = locationBarWidth <= kMinimumLocationBarWidth;
   if (locationBarAtMinSize_) {
     CGFloat dX = kMinimumLocationBarWidth - locationBarWidth;
     [self adjustLocationSizeBy:dX animate:NO];
   }
 }
 
 - (void)toolbarFrameChanged {
   // Do nothing if the frame changes but no Browser Action Controller is
   // present.
   if (!browserActionsController_.get())
     return;
 
   [self maintainMinimumLocationBarWidth];
 
   if (locationBarAtMinSize_) {
     // Once the grippy is pinned, leave it until it is explicity un-pinned.
     [browserActionsContainerView_ setGrippyPinned:YES];
     NSRect containerFrame = [browserActionsContainerView_ frame];
     // Determine how much the container needs to move in case it's overlapping
     // with the location bar.
-    CGFloat dX = NSMaxX([locationBar_ frame]) -
-        containerFrame.origin.x + kBrowserActionsContainerLeftPadding;
+    CGFloat dX = NSMaxX([locationBar_ frame]) - containerFrame.origin.x;
     containerFrame = NSOffsetRect(containerFrame, dX, 0);
     containerFrame.size.width -= dX;
     [browserActionsContainerView_ setFrame:containerFrame];
   } else if (!locationBarAtMinSize_ &&
       [browserActionsContainerView_ grippyPinned]) {
     // Expand out the container until it hits the saved size, then unpin the
     // grippy.
     // Add 0.1 pixel so that it doesn't hit the minimum width codepath above.
     CGFloat dX = NSWidth([locationBar_ frame]) -
         (kMinimumLocationBarWidth + 0.1);
@@ skipping 90 matching lines @@
 - (void)indicateDropURLsInView:(NSView*)view at:(NSPoint)point {
   // Do nothing.
 }
 
 // (URLDropTargetController protocol)
 - (void)hideDropURLsIndicatorInView:(NSView*)view {
   // Do nothing.
 }
 
 @end