[Mac][Material Design] Adjust focus ring position of bookmark bar items.

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 377 matching lines @@
 - (CGFloat)textStartXOffset {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [super textStartXOffset];
   }
   return kIconLeftPadding + [[self image] size].width + kIconTextSpacer;
 }
 
 - (void)drawFocusRingMaskWithFrame:(NSRect)cellFrame
                             inView:(NSView*)controlView {
   if (ui::MaterialDesignController::IsModeMaterial()) {
-    // In Material Design we have to move the focus ring over by 2 pts to get it
-    // to line up with the image.
-    if ([self visibleTitle].length > 0) {
-      cellFrame.origin.x += 2;
-    }
-
-    // We also have to nudge the chevron button's focus ring up 2pts.
+    // In Material Design we have to adjust the focus ring slightly for the
+    // chevron and regular bookmark icons.
     if ([self isOffTheSideButtonCell]) {
       cellFrame.origin.y -= 2;
+    } else if ([self visibleTitle].length > 0) {
+      cellFrame.origin.x += 4;
+    }
+    if ([controlView cr_lineWidth] < 1) {
+      cellFrame.origin.y -= 0.5;
     }
   }
   [super drawFocusRingMaskWithFrame:cellFrame inView:controlView];
 }
 
 // Override cell drawing to add a submenu arrow like a real menu.
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   // First draw "everything else".
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 
@@ skipping 33 matching lines @@
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   if ([self isMaterialDesignButtonType] && ![self isFolderButtonCell] &&
       kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end