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

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 353 matching lines @@
   return imageRect;
 }
 
 - (CGFloat)textStartXOffset {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [super textStartXOffset];
   }
   return kIconLeftPadding + [[self image] size].width + kIconTextSpacer;
 }
 
+- (void)drawFocusRingMaskWithFrame:(NSRect)cellFrame
+                            inView:(NSView*)controlView {
+  // 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".
   [super drawInteriorWithFrame:cellFrame inView:controlView];
 
   // If asked to do so, and if a folder, draw the arrow.
   if (!drawFolderArrow_)
     return;
   BookmarkButton* button = static_cast<BookmarkButton*>([self controlView]);
   DCHECK([button respondsToSelector:@selector(isFolder)]);
@@ skipping 28 matching lines @@
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
       ![self isFolderButtonCell] && kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end