[Mac][Material Design] Fix MD bookmarks button focus ring regression.

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 9a3799ac826631348634e1a02e87d2367e476be7..013c4bda5737245958274d92e4d43b01856247af 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm
@@ -371,6 +371,17 @@ const int kDefaultFontSize = 12;
   return kIconLeftPadding + [[self image] size].width + kIconTextSpacer;
 }
 
+- (void)drawFocusRingMaskWithFrame:(NSRect)cellFrame
+                            inView:(NSView *)controlView {

[Avi (use Gerrit), 2016/06/02 23:26:16]

no space left of the *

[shrike, 2016/06/02 23:59:35]

Done.

+  // In Material Design we have to move the focus ring over by 2 pts to get it
+  // to line up with the image.
+  if (ui::MaterialDesignController::IsModeMaterial() &&
+      [self visibleTitle].length > 0) {
+    cellFrame.origin.x += 2;
+  }
+  [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".