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

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 251 matching lines @@
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
   return 4.0;
 }
 
 CGFloat BookmarkLeftMargin() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
-  return 10.0;
+  return 12.0;
 }
 
 CGFloat BookmarkRightMargin() {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 2.0;
   }
-  return 10.0;
+  return 12.0;
 }
 
 }  // namespace bookmarks
 
 @implementation BookmarkBarController
 
 @synthesize currentState = currentState_;
 @synthesize lastState = lastState_;
 @synthesize isAnimationRunning = isAnimationRunning_;
 @synthesize delegate = delegate_;
@@ skipping 942 matching lines @@
   }
   return menu;
 }
 
 // Return an appropriate width for the given bookmark button cell.
 // The "+2" is needed because, sometimes, Cocoa is off by a tad.
 // Example: for a bookmark named "Moma" or "SFGate", it is one pixel
 // too small.  For "FBL" it is 2 pixels too small.
 // For a bookmark named "SFGateFooWoo", it is just fine.
 - (CGFloat)widthForBookmarkButtonCell:(NSCell*)cell {
-  CGFloat desired = [cell cellSize].width + 2;
+  CGFloat desired = [cell cellSize].width;
+  if (!ui::MaterialDesignController::IsModeMaterial()) {
+    desired += 2;
+  }
   return std::min(desired, bookmarks::kDefaultBookmarkWidth);
 }
 
 - (IBAction)openBookmarkMenuItem:(id)sender {
   int64_t tag = [self nodeIdFromMenuTag:[sender tag]];
   const BookmarkNode* node =
       bookmarks::GetBookmarkNodeByID(bookmarkModel_, tag);
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   [self openURL:node->url() disposition:disposition];
@@ skipping 1834 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