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

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 237 matching lines @@
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate;
 
 @end
 
 namespace bookmarks {
 
 CGFloat BookmarkHorizontalPadding() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 1.0;
   }
-  return 10.0;
+  return 4.0;
 }
 
 CGFloat BookmarkVerticalPadding() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
   return 4.0;
 }
 
 CGFloat BookmarkLeftMargin() {
@@ skipping 210 matching lines @@
   [[self view] setFrame:NSMakeRect(0, 0, initialWidth_, 0)];
 
   const bool isModeMaterial = ui::MaterialDesignController::IsModeMaterial();
 
   // Complete init of the "off the side" button, as much as we can.
   if (isModeMaterial) {
     [offTheSideButton_ setImage:[self offTheSideButtonImage:NO]];
     BookmarkButtonCell* offTheSideCell = [offTheSideButton_ cell];
     [offTheSideCell setTag:kMaterialStandardButtonTypeWithLimitedClickFeedback];
     [offTheSideCell setImagePosition:NSImageOnly];
+
+    // The cell is configured in the nib to draw a white highlight when clicked.
+    [offTheSideCell setHighlightsBy:NSNoCellMask];
   } else {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     [offTheSideButton_ setImage:
           rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_CHEVRONS).ToNSImage()];
     [offTheSideButton_.draggableButton setDraggable:NO];
     [offTheSideButton_.draggableButton setActsOnMouseDown:YES];
   }
 
   // We are enabled by default.
   barIsEnabled_ = YES;
 
   // Remember the original sizes of the 'no items' and 'import bookmarks'
   // fields to aid in resizing when the window frame changes.
   originalNoItemsRect_ = [[buttonView_ noItemTextfield] frame];
   originalImportBookmarksRect_ = [[buttonView_ importBookmarksButton] frame];
   if (isModeMaterial) {
     // Bookmark buttons start farther from the bookmark bar's left edge so
     // adjust the positions of the noItems and importBookmarks textfields.
     const CGFloat kMaterialBookmarksTextfieldOffsetX = 14;
     originalNoItemsRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
     [[buttonView_ noItemTextfield] setFrame:originalNoItemsRect_];
 
     originalImportBookmarksRect_.origin.x += kMaterialBookmarksTextfieldOffsetX;
     [[buttonView_ importBookmarksButton] setFrame:originalImportBookmarksRect_];
+
+    // Move the chevron button up 2pts from its position in the xib.
+    NSRect chevronButtonFrame = [offTheSideButton_ frame];
+    chevronButtonFrame.origin.y -= 2;
+    [offTheSideButton_ setFrame:chevronButtonFrame];
   }
 
   // To make life happier when the bookmark bar is floating, the chevron is a
   // child of the button view.
   [offTheSideButton_ removeFromSuperview];
   [buttonView_ addSubview:offTheSideButton_];
 
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
   [[self view] setPostsFrameChangedNotifications:YES];
@@ skipping 2559 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