[Material][Mac] Fixed Bookmark Items Highlight Issues

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 328 matching lines @@
   return [super startTrackingAt:startPoint inView:controlView];
 }
 
 // Since we have our own drawWithFrame:, we need to also have our own
 // logic for determining when the mouse is inside for honoring this
 // request.
 - (void)setShowsBorderOnlyWhileMouseInside:(BOOL)showOnly {
   [super setShowsBorderOnlyWhileMouseInside:showOnly];
   if (showOnly) {
     [self updateTrackingAreas];
-    if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback)
-      [self setHighlighted:isMouseInside_];
   } else {
     if (trackingArea_) {
       [[self controlView] removeTrackingArea:trackingArea_];
       trackingArea_.reset(nil);
       if (isMouseInside_) {
         isMouseInside_ = NO;
         [[self controlView] setNeedsDisplay:YES];
       }
     }
   }
@@ skipping 217 matching lines @@
 // TODO(viettrungluu): clean this up.
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   NSRect innerFrame;
   NSBezierPath* innerPath = nil;
   [self getDrawParamsForFrame:cellFrame
                        inView:controlView
                    innerFrame:&innerFrame
                     innerPath:&innerPath
                      clipPath:NULL];
 
-  BOOL pressed = ([((NSControl*)[self controlView]) isEnabled] &&
-                  [self isHighlighted]);
+  BOOL enabled = [((NSControl*)[self controlView]) isEnabled];
+  BOOL pressed = enabled && [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. In Material Design, the "border" is
   // actually a highlight, which should be drawn if
   // |showsBorderOnlyWhileMouseInside| is true.
   BOOL hasMaterialHighlight =
       [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
-      ![self showsBorderOnlyWhileMouseInside];
+      ![self showsBorderOnlyWhileMouseInside] &&
+      enabled;
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
       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
@@ skipping 240 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end