Mac: Fix missing focus rings on toolbar, profile, and tab buttons

chrome/browser/ui/cocoa/new_tab_button.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/new_tab_button.h"
 
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace {
+
+NSImage* GetMaskImage() {
+  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+  return bundle.GetNativeImageNamed(IDR_NEWTAB_BUTTON_MASK).ToNSImage();
+}
+
+}
+
 // A simple override of the ImageButtonCell to disable handling of
 // -mouseEntered.
 @interface NewTabButtonCell : ImageButtonCell
 
 - (void)mouseEntered:(NSEvent*)theEvent;
 
 @end
 
 @implementation NewTabButtonCell
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   // Ignore this since the NTB enter is handled by the TabStripController.
 }
 
+- (void)drawFocusRingMaskWithFrame:(NSRect)cellFrame inView:(NSView*)view {
+  // Match the button's shape.
+  [self drawImage:GetMaskImage() withFrame:cellFrame inView:view];
+}
+
 @end
 
 
 @implementation NewTabButton
 
 + (Class)cellClass {
   return [NewTabButtonCell class];
 }
 
 - (BOOL)pointIsOverButton:(NSPoint)point {
   NSPoint localPoint = [self convertPoint:point fromView:[self superview]];
   NSRect pointRect = NSMakeRect(localPoint.x, localPoint.y, 1, 1);
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  NSImage* buttonMask =
-      bundle.GetNativeImageNamed(IDR_NEWTAB_BUTTON_MASK).ToNSImage();
+  NSImage* buttonMask = GetMaskImage();
   NSRect destinationRect = NSMakeRect(
       (NSWidth(self.bounds) - [buttonMask size].width) / 2,
       (NSHeight(self.bounds) - [buttonMask size].height) / 2,
       [buttonMask size].width, [buttonMask size].height);
   return [buttonMask hitTestRect:pointRect
         withImageDestinationRect:destinationRect
                          context:nil
                            hints:nil
                          flipped:YES];
 }
@@ skipping 10 matching lines @@
 
 - (void)windowDidChangeTheme {
   [self setNeedsDisplay:YES];
 }
 
 - (void)windowDidChangeActive {
   [self setNeedsDisplay:YES];
 }
 
 @end