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

chrome/browser/ui/cocoa/image_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/image_button_cell.h"
 
 #include "base/logging.h"
+#include "base/mac/mac_util.h"
 #import "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/rect_path_utils.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 // When the window doesn't have focus then we want to draw the button with a
 // slightly lighter color. We do this by just reducing the alpha.
 const CGFloat kImageNoFocusAlpha = 0.65;
@@ skipping 75 matching lines @@
   [image drawInRect:imageRect
            fromRect:NSZeroRect
           operation:NSCompositeSourceOver
            fraction:alpha
      respectFlipped:YES
               hints:nil];
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   [self drawImageWithFrame:cellFrame inView:controlView];
-  // Only draw custom focus ring if the 10.7 focus ring APIs are not available.
-  // TODO(groby): Remove once we build against the 10.7 SDK.
-  if (![self respondsToSelector:@selector(drawFocusRingMaskWithFrame:inView:)])
-    [self drawFocusRingWithFrame:cellFrame inView:controlView];
+  [self drawFocusRingWithFrame:cellFrame inView:controlView];
 }
 
 - (void)setImageID:(NSInteger)imageID
     forButtonState:(image_button_cell::ButtonState)state {
   DCHECK_GE(state, 0);
   DCHECK_LT(state, image_button_cell::kButtonStateCount);
 
   image_[state].image.reset();
   image_[state].imageId = imageID;
   [[self controlView] setNeedsDisplay:YES];
@@ skipping 13 matching lines @@
 - (CGFloat)imageAlphaForWindowState:(NSWindow*)window {
   BOOL windowHasFocus = [window isMainWindow] || [window isKeyWindow];
   return windowHasFocus ? 1.0 : kImageNoFocusAlpha;
 }
 
 - (ui::ThemeProvider*)themeProviderForWindow:(NSWindow*)window {
   return [window themeProvider];
 }
 
 - (void)drawFocusRingWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
+  // Draw custom focus ring only if AppKit won't draw one automatically.
+  // The new focus ring APIs became available with 10.7, but did not get
+  // applied to buttons (only editable text fields) until 10.8.
+  if (base::mac::IsOSMountainLionOrLater())
+    return;
+
   if (![self showsFirstResponder])
     return;
   gfx::ScopedNSGraphicsContextSaveGState scoped_state;
   const CGFloat lineWidth = [controlView cr_lineWidth];
   rect_path_utils::FrameRectWithInset(rect_path_utils::RoundedCornerAll,
                                       NSInsetRect(cellFrame, 0, lineWidth),
                                       0.0,            // insetX
                                       0.0,            // insetY
                                       3.0,            // outerRadius
                                       lineWidth * 2,  // lineWidth
@@ skipping 52 matching lines @@
 
 - (void)mouseEntered:(NSEvent*)theEvent {
   [self setIsMouseInside:YES];
 }
 
 - (void)mouseExited:(NSEvent*)theEvent {
   [self setIsMouseInside:NO];
 }
 
 @end