[Mac][Material Design] Adjust bookmark spacing and folder menu drawing.

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"
@@ skipping 41 matching lines @@
 - (NSImage*)dragImage;
 
 - (void)installCustomTrackingArea;
 
 @end  // @interface BookmarkButton(Private)
 
 @implementation BookmarkButton
 
 @synthesize delegate = delegate_;
 @synthesize acceptsTrackIn = acceptsTrackIn_;
+@synthesize backgroundColor = backgroundColor_;
 
 - (id)initWithFrame:(NSRect)frameRect {
   // BookmarkButton's ViewID may be changed to VIEW_ID_OTHER_BOOKMARKS in
   // BookmarkBarController, so we can't just override -viewID method to return
   // it.
   if ((self = [super initWithFrame:frameRect])) {
     view_id_util::SetID(self, VIEW_ID_BOOKMARK_BAR_ELEMENT);
     [self installCustomTrackingArea];
   }
   return self;
 }
 
 - (void)dealloc {
   if ([[self cell] respondsToSelector:@selector(safelyStopPulsing)])
     [[self cell] safelyStopPulsing];
   view_id_util::UnsetID(self);
 
   if (area_) {
     [self removeTrackingArea:area_];
     [area_ release];
   }
 
+  [backgroundColor_ release];
+
   [super dealloc];
 }
 
 - (const BookmarkNode*)bookmarkNode {
   return [[self cell] bookmarkNode];
 }
 
 - (BOOL)isFolder {
   const BookmarkNode* node = [self bookmarkNode];
   return (node && node->is_folder());
@@ skipping 323 matching lines @@
 }
 
 - (BOOL)isOpaque {
   // Make this control opaque so that sub-pixel anti-aliasing works when
   // CoreAnimation is enabled.
   return YES;
 }
 
 - (void)drawRect:(NSRect)rect {
   NSView* bookmarkBarToolbarView = [[self superview] superview];
-  [self cr_drawUsingAncestor:bookmarkBarToolbarView inRect:(NSRect)rect];
+  if (backgroundColor_) {
+    [backgroundColor_ set];
+    NSRectFill(rect);
+  } else {
+    [self cr_drawUsingAncestor:bookmarkBarToolbarView inRect:(NSRect)rect];
+  }
   [super drawRect:rect];
 }
 
 - (void)updateIconToMatchTheme {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return;
   }
 
   // During testing, the window might not be a browser window, and the
   // superview might not be a BookmarkBarView.
@@ skipping 80 matching lines @@
   [[cell clipPathForFrame:bounds inView:self] setClip];
   [cell drawWithFrame:bounds inView:self];
 
   CGContextEndTransparencyLayer(cgContext);
   [image unlockFocus];
 
   return image.autorelease();
 }
 
 @end