mac: Remove IsOSLion().

chrome/browser/ui/cocoa/status_bubble_mac.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/status_bubble_mac.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
-#include "base/mac/mac_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bubble_view.h"
 #include "components/url_formatter/elide_url.h"
 #include "components/url_formatter/url_formatter.h"
 #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h"
@@ skipping 720 matching lines @@
         NSMaxX(actual_window_frame) - NSWidth(window_frame);
   }
   actual_window_frame.size.width = NSWidth(window_frame);
 
   // Do not expand if it's going to cover mouse location.
   gfx::Point p = GetMouseLocation();
   if (NSPointInRect(NSMakePoint(p.x(), p.y()), actual_window_frame))
     return;
 
   // Get the current corner flags and see what needs to change based on the
-  // expansion. This is only needed on Lion, which has rounded window bottoms.
-  if (base::mac::IsOSLionOrLater()) {
-    unsigned long corner_flags = [[window_ contentView] cornerFlags];
-    corner_flags |= OSDependentCornerFlags(actual_window_frame);
-    [[window_ contentView] setCornerFlags:corner_flags];
-  }
+  // expansion.
+  unsigned long corner_flags = [[window_ contentView] cornerFlags];
+  corner_flags |= OSDependentCornerFlags(actual_window_frame);
+  [[window_ contentView] setCornerFlags:corner_flags];
+
 
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext] setDuration:kExpansionDurationSeconds];
   [[window_ animator] setFrame:actual_window_frame display:YES];
   [NSAnimationContext endGrouping];
 }
 
 void StatusBubbleMac::UpdateSizeAndPosition() {
   if (!window_)
     return;
@@ skipping 57 matching lines @@
     size.width = kWindowWidthPercent * screenRect.size.width;
   }
 
   screenRect.size = size;
   return screenRect;
 }
 
 unsigned long StatusBubbleMac::OSDependentCornerFlags(NSRect window_frame) {
   unsigned long corner_flags = 0;
 
-  if (base::mac::IsOSLionOrLater()) {
-    NSRect parent_frame = [parent_ frame];
+  NSRect parent_frame = [parent_ frame];
 
-    // Round the bottom corners when they're right up against the
-    // corresponding edge of the parent window, or when below the parent
-    // window.
-    if (NSMinY(window_frame) <= NSMinY(parent_frame)) {
-      if (NSMinX(window_frame) == NSMinX(parent_frame)) {
-        corner_flags |= kRoundedBottomLeftCorner;
-      }
-
-      if (NSMaxX(window_frame) == NSMaxX(parent_frame)) {
-        corner_flags |= kRoundedBottomRightCorner;
-      }
+  // Round the bottom corners when they're right up against the
+  // corresponding edge of the parent window, or when below the parent
+  // window.
+  if (NSMinY(window_frame) <= NSMinY(parent_frame)) {
+    if (NSMinX(window_frame) == NSMinX(parent_frame)) {
+      corner_flags |= kRoundedBottomLeftCorner;
     }
 
-    // Round the top corners when the bubble is below the parent window.
-    if (NSMinY(window_frame) < NSMinY(parent_frame)) {
-      corner_flags |= kRoundedTopLeftCorner | kRoundedTopRightCorner;
+    if (NSMaxX(window_frame) == NSMaxX(parent_frame)) {
+      corner_flags |= kRoundedBottomRightCorner;
     }
   }
 
+  // Round the top corners when the bubble is below the parent window.
+  if (NSMinY(window_frame) < NSMinY(parent_frame)) {
+    corner_flags |= kRoundedTopLeftCorner | kRoundedTopRightCorner;
+  }
+
   return corner_flags;
 }