[Mac][Material Design] Fix bookmark chevron button focus ring location.

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_bar_controller.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"

[tapted, 2016/06/16 21:04:26]

nit: remove these 2 added imports

[shrike, 2016/06/16 22:52:03]

Done.

 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.h"
 #include "chrome/grit/generated_resources.h"
 #import "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/user_metrics.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 12 matching lines @@
 }
 
 const int kIconTextSpacer = 4;
 const int kTextRightPadding = 1;
 const int kIconLeftPadding = 1;
 
 const int kDefaultFontSize = 12;
 
 };  // namespace
 
+@interface OffTheSideButtonCell : BookmarkButtonCell
+@end
+@implementation OffTheSideButtonCell
+
+- (BOOL)isOffTheSideButtonCell {
+  return YES;
+}
+
+@end
+
 @interface BookmarkButtonCell(Private)
+// Returns YES if the cell is the offTheSide button cell.
+- (BOOL)isOffTheSideButtonCell;
 - (void)configureBookmarkButtonCell;
 - (void)applyTextColor;
 // Returns the title the button cell displays. Note that a button cell can
 // have a title string assigned but it won't be visible if its image position
 // is NSImageOnly.
 - (NSString*)visibleTitle;
 // Returns the dictionary of attributes to associate with the button title.
 - (NSDictionary*)titleTextAttributes;
 @end
 
@@ skipping 83 matching lines @@
 // Used by the off-the-side menu, the only case where a
 // BookmarkButtonCell is loaded from a nib.
 - (void)awakeFromNib {
   [self configureBookmarkButtonCell];
 }
 
 - (BOOL)isFolderButtonCell {
   return NO;
 }
 
+- (BOOL)isOffTheSideButtonCell {
+  return NO;
+}
+
 // Perform all normal init routines specific to the BookmarkButtonCell.
 - (void)configureBookmarkButtonCell {
   [self setButtonType:NSMomentaryPushInButton];
   [self setShowsBorderOnlyWhileMouseInside:YES];
   [self setControlSize:NSSmallControlSize];
   [self setAlignment:NSLeftTextAlignment];
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     [self setFont:[NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
     [self setBezelStyle:NSShadowlessSquareBezelStyle];
   } else {
@@ skipping 210 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 {
-  // 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;
+  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.
+    if ([self isOffTheSideButtonCell]) {
+      cellFrame.origin.y -= 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.
@@ skipping 32 matching lines @@
   const CGFloat kLineWidth = [controlView cr_lineWidth];
   if ([self tag] == kMaterialStandardButtonTypeWithLimitedClickFeedback &&
       ![self isFolderButtonCell] && kLineWidth < 1) {
     return -kLineWidth;
   }
   return 0.0;
 }
 
 
 @end