Merge 54782 - [Mac] Adjust toolbar spacing of browser actions for M6....

chrome/browser/cocoa/extensions/browser_actions_container_view.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/extensions/browser_actions_container_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #import "base/scoped_nsobject.h"
 
 NSString* const kBrowserActionGrippyDragStartedNotification =
     @"BrowserActionGrippyDragStartedNotification";
 NSString* const kBrowserActionGrippyDraggingNotification =
     @"BrowserActionGrippyDraggingNotification";
 NSString* const kBrowserActionGrippyDragFinishedNotification =
     @"BrowserActionGrippyDragFinishedNotification";
 
 namespace {
 const CGFloat kAnimationDuration = 0.2;
-const CGFloat kGrippyWidth = 8.0;
-const CGFloat kLowerPadding = 6.0;
+const CGFloat kGrippyWidth = 4.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)
 // Returns the cursor that should be shown when hovering over the grippy based
 // on |canDragLeft_| and |canDragRight_|.
 - (NSCursor*)appropriateCursorForGrippy;
 @end
 
 @implementation BrowserActionsContainerView
 
@@ skipping 11 matching lines @@
   if ((self = [super initWithFrame:frameRect])) {
     grippyRect_ = NSMakeRect(0.0, 0.0, kGrippyWidth, NSHeight([self bounds]));
     canDragLeft_ = YES;
     canDragRight_ = YES;
     resizable_ = YES;
     [self setHidden:YES];
   }
   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;
   resizable_ = resizable;
   [self setNeedsDisplay:YES];
 }
 
 - (BOOL)isResizable {
   return resizable_;
 }
@@ skipping 111 matching lines @@
     retVal = [NSCursor resizeRightCursor];
   } else if (!canDragRight_) {
     retVal = [NSCursor resizeLeftCursor];
   } else {
     retVal = [NSCursor resizeLeftRightCursor];
   }
   return retVal;
 }
 
 @end