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

chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm

 // Copyright (c) 2011 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_cell.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
@@ skipping 14 matching lines @@
 
 // Padding on the right side of the arrow icon.
 const int kHierarchyButtonRightPadding = 4;
 
 // Padding on the left side of the arrow icon.
 int HierarchyButtonLeftPadding() {
   return ui::MaterialDesignController::IsModeMaterial() ? 11 : 2;
 }
 
 const int kIconTextSpacer = 4;
-const int kTextRightPadding = 1;
-const int kIconLeftPadding = 1;
+const int kTextRightPadding = 3;
+const int kIconLeftPadding = 3;
 
 const int kDefaultFontSize = 12;
 
 };  // namespace
 
 @interface OffTheSideButtonCell : BookmarkButtonCell
 @end
 @implementation OffTheSideButtonCell
 
 - (BOOL)isOffTheSideButtonCell {
@@ skipping 389 matching lines @@
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return 0;
   }
   return -1;
 }
 
 - (CGFloat)hoverBackgroundVerticalOffsetInControlView:(NSView*)controlView {
   // In Material Design on Retina, and not in a folder menu, nudge the hover
   // background by 1px.
   const CGFloat kLineWidth = [controlView cr_lineWidth];
-  if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
-      ![self isFolderButtonCell] && kLineWidth < 1) {
+  if ([self isMaterialDesignButtonType] && ![self isFolderButtonCell] &&
+      kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end