mac: Remove IsOSLion().

chrome/browser/ui/cocoa/gradient_button_cell.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.
 
 #include "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 #include <cmath>
 
 #include "base/logging.h"
-#include "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "chrome/browser/themes/theme_properties.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"
 #include "grit/theme_resources.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h"
 #import "ui/base/cocoa/nsgraphics_context_additions.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
@@ skipping 500 matching lines @@
                    innerFrame:&innerFrame
                     innerPath:&innerPath
                      clipPath:NULL];
 
   BOOL pressed = ([((NSControl*)[self controlView]) isEnabled] &&
                   [self isHighlighted]);
   NSWindow* window = [controlView window];
   const ui::ThemeProvider* themeProvider = [window themeProvider];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
-  // 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.
-  BOOL shouldDrawFocusRing = base::mac::IsOSLionOrEarlier() &&
-                             [self showsFirstResponder];
-
   // Stroke the borders and appropriate fill gradient. If we're borderless, the
   // only time we want to draw the inner gradient is if we're highlighted or if
   // we're drawing the focus ring manually.
   if (([self isBordered] && ![self showsBorderOnlyWhileMouseInside]) ||
-      pressed ||
-      [self isMouseInside] ||
-      [self isContinuousPulsing] ||
-      shouldDrawFocusRing) {
-
+      pressed || [self isMouseInside] || [self isContinuousPulsing]) {
     // When pulsing we want the bookmark to stand out a little more.
     BOOL showClickedGradient = pressed ||
         (pulseState_ == gradient_button_cell::kPulsingContinuous);
 
     [self drawBorderAndFillForTheme:themeProvider
                         controlView:controlView
                           innerPath:innerPath
                 showClickedGradient:showClickedGradient
               showHighlightGradient:[self isHighlighted]
                          hoverAlpha:[self hoverAlpha]
@@ skipping 11 matching lines @@
     NSColor* stroke = themeProvider ? themeProvider->GetNSColor(
         active ? ThemeProperties::COLOR_TOOLBAR_BUTTON_STROKE :
                  ThemeProperties::COLOR_TOOLBAR_BUTTON_STROKE_INACTIVE) :
         [NSColor blackColor];
 
     [[stroke colorWithAlphaComponent:0.2] set];
     NSRectFillUsingOperation(NSInsetRect(borderRect, 0, 2),
                              NSCompositeSourceOver);
   }
   [self drawInteriorWithFrame:innerFrame inView:controlView];
-
-  if (shouldDrawFocusRing) {
-    gfx::ScopedNSGraphicsContextSaveGState scoped_state;
-    const CGFloat lineWidth = [controlView cr_lineWidth];
-    // insetX = 1.0 is used for the drawing of blue highlight so that this
-    // highlight won't be too near the bookmark toolbar itself, in case we
-    // draw bookmark buttons in bookmark toolbar.
-    rect_path_utils::FrameRectWithInset(rect_path_utils::RoundedCornerAll,
-                                        NSInsetRect(cellFrame, 0, lineWidth),
-                                        1.0,            // insetX
-                                        0.0,            // insetY
-                                        3.0,            // outerRadius
-                                        lineWidth * 2,  // lineWidth
-                                        [controlView
-                                            cr_keyboardFocusIndicatorColor]);
-  }
 }
 
 - (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   const CGFloat lineWidth = [controlView cr_lineWidth];
 
   if (shouldTheme_) {
     BOOL isTemplate = [[self image] isTemplate];
 
     gfx::ScopedNSGraphicsContextSaveGState scopedGState;
 
@@ skipping 183 matching lines @@
                              options:options
                                owner:self
                             userInfo:nil]);
   if (isMouseInside_ != mouseInView) {
     [self setMouseInside:mouseInView animate:NO];
     [controlView setNeedsDisplay:YES];
   }
 }
 
 @end