[Mac] Adds back in the right divider at alcor's request. Tightens up the right wrench menu in Toolbar.xib.

TEST=none
BUG=45764
Review URL: http://codereview.chromium.org/2813025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50512 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 32 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
index 4fa7b15a..d0518c6 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_container_view.mm
@@ -19,7 +19,12 @@ NSString* const kBrowserActionGrippyDragFinishedNotification =
 namespace {
 const CGFloat kAnimationDuration = 0.2;
 const CGFloat kGrippyWidth = 8.0;
+const CGFloat kLowerPadding = 5.0;
 const CGFloat kMinimumContainerWidth = 10.0;
+const CGFloat kRightBorderXOffset = -1.0;
+const CGFloat kRightBorderWidth = 1.0;
+const CGFloat kRightBorderGrayscale = 0.5;
+const CGFloat kUpperPadding = 9.0;
 }  // namespace
 
 @interface BrowserActionsContainerView(Private)
@@ -51,6 +56,24 @@ const CGFloat kMinimumContainerWidth = 10.0;
   return self;
 }
 
+- (void)drawRect:(NSRect)dirtyRect {
+  NSRect bounds = [self bounds];
+  NSColor* middleColor =
+     [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:1.0];
+  NSColor* endPointColor =
+     [NSColor colorWithCalibratedWhite:kRightBorderGrayscale alpha:0.0];
+  scoped_nsobject<NSGradient> borderGradient([[NSGradient alloc]
+     initWithColorsAndLocations:endPointColor, (CGFloat)0.0,
+                                middleColor, (CGFloat)0.5,
+                                endPointColor, (CGFloat)1.0,
+                                nil]);
+  CGFloat xPos = bounds.origin.x + bounds.size.width - kRightBorderWidth +
+     kRightBorderXOffset;
+  NSRect borderRect = NSMakeRect(xPos, kLowerPadding, kRightBorderWidth,
+     bounds.size.height - kUpperPadding);
+  [borderGradient drawInRect:borderRect angle:90.0];
+}
+
 - (void)setResizable:(BOOL)resizable {
   if (resizable == resizable_)
     return;
diff --git a/chrome/browser/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
index 0b9a9cc..19a1d56 100644
--- a/chrome/browser/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/cocoa/extensions/browser_actions_controller.mm
@@ -40,8 +40,9 @@ const CGFloat kAnimationDuration = 0.2;
 const CGFloat kButtonOpacityLeadPadding = 5.0;
 const CGFloat kChevronHeight = 28.0;
 const CGFloat kChevronLowerPadding = 5.0;
+const CGFloat kChevronRightPadding = 5.0;
 const CGFloat kChevronWidth = 14.0;
-const CGFloat kGrippyXOffset = 7.0;
+const CGFloat kGrippyXOffset = 5.0;
 }  // namespace
 
 @interface BrowserActionsController(Private)
@@ -550,12 +551,16 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
 - (CGFloat)containerWidthWithButtonCount:(NSUInteger)buttonCount {
   CGFloat width = 0.0;
   if (buttonCount > 0) {
-    width = kGrippyXOffset +
+    width = kGrippyXOffset + (2 * kBrowserActionButtonPadding) +
         (buttonCount * (kBrowserActionWidth + kBrowserActionButtonPadding));
   }
   // Make room for the chevron if any buttons are hidden.
-  if ([self buttonCount] != [self visibleButtonCount])
+  if ([self buttonCount] != [self visibleButtonCount]) {
     width += kChevronWidth + kBrowserActionButtonPadding;
+    // Add more space if all buttons are hidden.
+    if ([self visibleButtonCount] == 0)
+      width += 3 * kBrowserActionButtonPadding;
+  }
 
   return width;
 }
@@ -728,7 +733,7 @@ class ExtensionsServiceObserverBridge : public NotificationObserver,
 }
 
 - (void)updateChevronPositionInFrame:(NSRect)frame {
-  CGFloat xPos = NSWidth(frame) - kChevronWidth;
+  CGFloat xPos = NSWidth(frame) - kChevronWidth - kChevronRightPadding;
   NSRect buttonFrame = NSMakeRect(xPos,
                                   kChevronLowerPadding,
                                   kChevronWidth,