[Material][Mac] Fix for Bookmark Subfolders Hover State

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 575 matching lines @@
                      clipPath:NULL];
 
   BOOL pressed = ([((NSControl*)[self controlView]) isEnabled] &&
                   [self isHighlighted]);
   NSWindow* window = [controlView window];
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
   // Stroke the borders and appropriate fill gradient. If we're borderless, the
   // only time we want to draw the inner gradient is if we're highlighted or if
-  // we're drawing the focus ring manually.
+  // we're drawing the focus ring manually. In Material Design, the "border" is
+  // actually a highlight, which should be drawn if
+  // |showsBorderOnlyWhileMouseInside| is true.
+  BOOL hasMaterialHighlight =
+      [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
+      ![self showsBorderOnlyWhileMouseInside];
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
-      pressed || [self isMouseInside] || [self isContinuousPulsing]) {
+      pressed || [self isMouseInside] || [self isContinuousPulsing] ||
+      hasMaterialHighlight) {
     // When pulsing we want the bookmark to stand out a little more.
     BOOL showClickedGradient = pressed ||
         (pulseState_ == gradient_button_cell::kPulsingContinuous);
+    BOOL showHighlightGradient = [self isHighlighted] || hasMaterialHighlight;
 
     [self drawBorderAndFillForTheme:themeProvider
                         controlView:controlView
                           innerPath:innerPath
                 showClickedGradient:showClickedGradient
-              showHighlightGradient:[self isHighlighted]
+              showHighlightGradient:showHighlightGradient
                          hoverAlpha:[self hoverAlpha]
                              active:active
                           cellFrame:cellFrame
                     defaultGradient:nil];
   }
 
   // If this is the left side of a segmented button, draw a slight shadow.
   ButtonType type = [[(NSControl*)controlView cell] tag];
   if (type == kLeftButtonWithShadowType) {
     const CGFloat lineWidth = [controlView cr_lineWidth];
@@ skipping 227 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end