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

chrome/browser/ui/cocoa/hover_close_button.mm

 // Copyright (c) 2012 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/hover_close_button.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMKeyValueAnimation.h"
@@ skipping 78 matching lines @@
   NSRect imageRect = NSZeroRect;
   imageRect.size = [image size];
 
   NSRect destRect = [self bounds];
   destRect.origin.y = floor((NSHeight(destRect) / 2)
                             - (NSHeight(imageRect) / 2));
   destRect.size = imageRect.size;
 
   switch(self.hoverState) {
     case kHoverStateMouseOver:
-      [image drawInRect:destRect
-               fromRect:imageRect
-              operation:NSCompositeSourceOver
-               fraction:1.0
-         respectFlipped:YES
-                  hints:nil];
-      break;
-
     case kHoverStateMouseDown:
       [image drawInRect:destRect
                fromRect:imageRect
               operation:NSCompositeSourceOver
                fraction:1.0
          respectFlipped:YES
                   hints:nil];
       break;
 
     case kHoverStateNone: {
@@ skipping 16 matching lines @@
                fromRect:imageRect
               operation:NSCompositeSourceOver
                fraction:value
          respectFlipped:YES
                   hints:nil];
       break;
     }
   }
 }
 
+- (void)drawFocusRingMask {
+  // Match the hover image's shape.
+  NSRect circleRect = NSInsetRect([self bounds], 2, 2);
+  [[NSBezierPath bezierPathWithOvalInRect:circleRect] fill];
+}
+
 - (void)setFadeOutValue:(CGFloat)value {
   [self setNeedsDisplay];
 }
 
 - (NSImage*)imageForHoverState:(HoverState)hoverState {
   int imageID = IDR_CLOSE_1;
   switch (hoverState) {
     case kHoverStateNone:
       imageID = IDR_CLOSE_1;
       break;
@@ skipping 88 matching lines @@
       break;
     case kHoverStateMouseDown:
       imageID = IDR_CLOSE_DIALOG_P;
       break;
   }
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   return bundle.GetNativeImageNamed(imageID).ToNSImage();
 }
 
 @end