[Mac][Material Design] Bring bookmark hover state, etc. up to spec.

chrome/browser/ui/cocoa/gradient_button_cell.mm

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #import "base/mac/scoped_nsobject.h"
@@ skipping 359 matching lines @@
                   defaultGradient:(NSGradient*)defaultGradient {
   // For Material Design, draw a solid rounded rect behind the button, based on
   // the hover and pressed states.
   if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback) {
     const CGFloat kEightPercentAlpha = 0.08;
     const CGFloat kFourPercentAlpha = 0.04;
 
     // The alpha is always at least 8%. Default the color to black.
     CGFloat alpha = kEightPercentAlpha;
     CGFloat color = 0.0;
-    // If a dark theme, incrase the opacity slightly and use white.
+
+    // If a dark theme, increase the opacity slightly and use white.
     if ([[controlView window] hasDarkTheme]) {
       alpha += kFourPercentAlpha;
       color = 1.0;
     }
     // If clicked or highlighted, the background is slightly more opaque. If not
     // clicked or highlighted, adjust the alpha by the animation fade in
     // percentage.
     if (showClickedGradient || showHighlightGradient) {
       alpha += kFourPercentAlpha;
     } else {
@@ skipping 115 matching lines @@
 // TODO(viettrungluu): clean this up.
 // (Private)
 - (void)getDrawParamsForFrame:(NSRect)cellFrame
                        inView:(NSView*)controlView
                    innerFrame:(NSRect*)returnInnerFrame
                     innerPath:(NSBezierPath**)returnInnerPath
                      clipPath:(NSBezierPath**)returnClipPath {
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   const CGFloat kHalfLineWidth = kLineWidth / 2.0;
 
-  NSRect drawFrame = cellFrame;
-  NSRect innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
+  NSRect drawFrame = NSZeroRect;
+  NSRect innerFrame = NSZeroRect;
   CGFloat cornerRadius = 2;
   if ([self tag] != kMaterialStandardButtonTypeWithLimitedClickFeedback) {
     drawFrame = NSInsetRect(cellFrame, 1.5 * kLineWidth, 1.5 * kLineWidth);
+    innerFrame = NSInsetRect(cellFrame, kLineWidth, kLineWidth);
     cornerRadius = 3;
+  } else {
+    drawFrame = cellFrame;
+    // Hover and click paths are always 20pt tall, regardless of the button's
+    // height.
+    drawFrame.size.height = 20;
+    innerFrame = NSInsetRect(drawFrame, kLineWidth, kLineWidth);
   }
 
   ButtonType type = [[(NSControl*)controlView cell] tag];
   switch (type) {
     case kMiddleButtonType:
       drawFrame.size.width += 20;
       innerFrame.size.width += 2;
       // Fallthrough
     case kRightButtonType:
       drawFrame.origin.x -= 20;
@@ skipping 303 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end