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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
index 9c1dd58e4a23f19d72e143276491ca723b9e41d1..60d5d0551bbc14076f40971635cfbac0e2b813c5 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
@@ -395,15 +395,15 @@ const int kDefaultFontSize = 12;
 - (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];