[Material][Mac] Fixed Bookmark Items Highlight Issues

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include <stddef.h>
 
 #import "base/mac/bundle_locations.h"
 #import "base/mac/foundation_util.h"
@@ skipping 1953 matching lines @@
 
 // Return an autoreleased NSCell suitable for a special button displayed on the
 // bookmark bar that is not attached to any bookmark node.
 // TODO(jrg): move much of the cell config into the BookmarkButtonCell class.
 - (BookmarkButtonCell*)cellForCustomButtonWithText:(NSString*)text
                                              image:(NSImage*)image {
   BookmarkButtonCell* cell =
       [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.
 
   return cell;
 }
 
 // Returns a frame appropriate for the given bookmark cell, suitable
 // for creating an NSButton that will contain it.  |xOffset| is the X
 // offset for the frame; it is increased to be an appropriate X offset
@@ skipping 640 matching lines @@
   // http://crbug.com/35966
   // If already opened, then we exited but re-entered the button, so do nothing.
   if ([folderController_ parentButton] == sender)
     return;
   // Else open a new one if it makes sense to do so.
   const BookmarkNode* node = [sender bookmarkNode];
   if (node && node->is_folder()) {
     // 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];
     folderController_ = nil;
   }
 }
 
 // BookmarkButtonDelegate protocol implementation.
 - (void)mouseExitedButton:(id)sender event:(NSEvent*)event {
   // Don't care; do nothing.
@@ skipping 31 matching lines @@
 - (void)closeAllBookmarkFolders {
   [self watchForExitEvent:NO];
 
   // Grab the parent button under Material Design to make sure that the
   // highlighting that was applied while revealing the menu is turned off.
   BookmarkButton* parentButton = nil;
   if (ui::MaterialDesignController::IsModeMaterial()) {
     parentButton = [folderController_ parentButton];
   }
   [folderController_ close];
-  [[parentButton cell] setHighlighted:NO];
   [parentButton setNeedsDisplay:YES];
   folderController_ = nil;
 }
 
 - (void)closeBookmarkFolder:(id)sender {
   // We're the top level, so close one means close them all.
   [self closeAllBookmarkFolders];
 }
 
 - (BookmarkModel*)bookmarkModel {
@@ skipping 389 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end