[Material][Mac] Fixed Bookmark Items Highlight Issues

Remove calls to setHighlighted: for MD bookmark items.
Ensure that the items aren't highlighted when they are not enabled

BUG=627722, 628187, 628204

Review-Url: https://codereview.chromium.org/2169623002
Cr-Commit-Position: refs/heads/master@{#407032}

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

@@ -1971,12 +1971,10 @@ CGFloat BookmarkRightMargin() {
       [BookmarkButtonCell buttonCellWithText:text
                                        image:image
                               menuController:contextMenuController_];
-  if (ui::MaterialDesignController::IsModeMaterial()) {
+  if (ui::MaterialDesignController::IsModeMaterial())
     [cell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
-    [cell setHighlightsBy:NSNoCellMask];
-  } else {
+  else
     [cell setTag:kStandardButtonTypeWithLimitedClickFeedback];
-  }
 
   // Note: a quirk of setting a cell's text color is that it won't work
   // until the cell is associated with a button, so we can't theme the cell yet.
@@ -2636,10 +2634,6 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     // Update |hoverButton_| so that it corresponds to the open folder.
     hoverButton_.reset([sender retain]);
     [folderTarget_ openBookmarkFolderFromButton:sender];
-
-    const BookmarkButtonCell* cell = [sender cell];
-    if ([cell tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback)
-      [cell setHighlighted:YES];
   } else {
     // We're over a non-folder bookmark so close any old folders.
     [folderController_ close];
@@ -2691,7 +2685,6 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     parentButton = [folderController_ parentButton];
   }
   [folderController_ close];
-  [[parentButton cell] setHighlighted:NO];
   [parentButton setNeedsDisplay:YES];
   folderController_ = nil;
 }

chrome/browser/ui/cocoa/bookmarks/bookmark_button.mm

@@ -360,16 +360,6 @@ BookmarkButton* gDraggedButton = nil; // Weak
   [delegate_ mouseExitedButton:self event:event];
 }
 
-- (void)mouseDown:(NSEvent*)theEvent {
-  // Clicking on a bookmark button in Material Design should highlight it.
-  const int kCellTag = [[self cell] tag];
-  if (kCellTag == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
-      [self isEnabled]) {
-    [self highlight:YES];
-  }
-  [super mouseDown:theEvent];
-}
-
 - (void)mouseMoved:(NSEvent*)theEvent {
   if ([delegate_ respondsToSelector:@selector(mouseMoved:)])
     [id(delegate_) mouseMoved:theEvent];

chrome/browser/ui/cocoa/gradient_button_cell.mm

@@ -346,8 +346,6 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4;
   [super setShowsBorderOnlyWhileMouseInside:showOnly];
   if (showOnly) {
     [self updateTrackingAreas];
-    if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback)
-      [self setHighlighted:isMouseInside_];
   } else {
     if (trackingArea_) {
       [[self controlView] removeTrackingArea:trackingArea_];
@@ -585,8 +583,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4;
                     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];
@@ -598,7 +596,8 @@ static const NSTimeInterval kAnimationContinuousCycleDuration = 0.4;
   // |showsBorderOnlyWhileMouseInside| is true.
   BOOL hasMaterialHighlight =
       [self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
-      ![self showsBorderOnlyWhileMouseInside];
+      ![self showsBorderOnlyWhileMouseInside] &&
+      enabled;
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
       pressed || [self isMouseInside] || [self isContinuousPulsing] ||
       hasMaterialHighlight) {