Reland of [Mac][Material Design] Update bookmarks bar to Material Design.

chrome/browser/ui/cocoa/bookmarks/bookmark_button.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_button.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/base/clipboard/clipboard_util_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 using base::UserMetricsAction;
 using bookmarks::BookmarkNode;
 
 // The opacity of the bookmark button drag image.
 static const CGFloat kDragImageOpacity = 0.7;
 
 namespace {
 // We need a class variable to track the current dragged button to enable
@@ skipping 317 matching lines @@
 // to open menu").
 - (void)mouseEntered:(NSEvent*)event {
   [delegate_ mouseEnteredButton:self event:event];
 }
 
 // See comments above mouseEntered:.
 - (void)mouseExited:(NSEvent*)event {
   [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];
 }
 
 - (void)mouseDragged:(NSEvent*)theEvent {
   if ([delegate_ respondsToSelector:@selector(mouseDragged:)])
     [id(delegate_) mouseDragged:theEvent];
 }
 
@@ skipping 48 matching lines @@
   // CoreAnimation is enabled.
   return YES;
 }
 
 - (void)drawRect:(NSRect)rect {
   NSView* bookmarkBarToolbarView = [[self superview] superview];
   [self cr_drawUsingAncestor:bookmarkBarToolbarView inRect:(NSRect)rect];
   [super drawRect:rect];
 }
 
+- (void)updateIconToMatchTheme {
+  if (!ui::MaterialDesignController::IsModeMaterial() || ![self isFolder]) {
+    return;
+  }
+
+  // During testing, the window might not be a browser window, and the
+  // superview might not be a BookmarkBarView.
+  if (![[self window] respondsToSelector:@selector(hasDarkTheme)] ||
+      ![[self superview] isKindOfClass:[BookmarkBarView class]]) {
+    return;
+  }
+
+  BookmarkBarView* bookmarkBarView =
+      base::mac::ObjCCastStrict<BookmarkBarView>([self superview]);
+  BookmarkBarController* bookmarkBarController = [bookmarkBarView controller];
+  BOOL darkTheme = [[self window] hasDarkTheme];
+  NSImage* theImage = nil;
+  // Make sure the "off the side" button gets the chevron icon.
+  if ([bookmarkBarController offTheSideButton] == self) {
+    theImage = [bookmarkBarController offTheSideButtonImage:darkTheme];
+  } else {
+    theImage = [bookmarkBarController faviconForNode:[self bookmarkNode]
+                                       forADarkTheme:darkTheme];
+  }
+
+  [[self cell] setImage:theImage];
+}
+
 - (void)viewDidMoveToWindow {
   [super viewDidMoveToWindow];
   if ([self window]) {
     // The new window may have different main window status.
     // This happens when the view is moved into a TabWindowOverlayWindow for
     // tab dragging.
+    [self updateIconToMatchTheme];
     [self windowDidChangeActive];
   }
 }
 
 // ThemedWindowDrawing implementation.
 
 - (void)windowDidChangeTheme {
+  [self updateIconToMatchTheme];
   [self setNeedsDisplay:YES];
 }
 
 - (void)windowDidChangeActive {
   [self setNeedsDisplay:YES];
 }
 
 - (void)installCustomTrackingArea {
   const NSTrackingAreaOptions options =
       NSTrackingActiveAlways |
@@ skipping 28 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end