Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: content/common/cursors/webcursor_mac.mm

Issue 1917973002: mac: Remove IsOSLion(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tapted Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/common.sb ('k') | content/common/sandbox_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/cursors/webcursor_mac.mm
diff --git a/content/common/cursors/webcursor_mac.mm b/content/common/cursors/webcursor_mac.mm
index 0205cbf98e860b5a0a74f126b5ed4dd1bdfdc6a6..05e3ec2fbbdc2a83865cfb2648f92a2a0e3dbefd 100644
--- a/content/common/cursors/webcursor_mac.mm
+++ b/content/common/cursors/webcursor_mac.mm
@@ -8,7 +8,6 @@
#include <stddef.h>
#include "base/logging.h"
-#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/sdk_forward_declarations.h"
#include "content/app/resources/grit/content_resources.h"
@@ -121,11 +120,9 @@ NSCursor* GetCoreCursorWithFallback(CrCoreCursorType type,
int resource_id,
int hotspot_x,
int hotspot_y) {
- if (base::mac::IsOSLionOrLater()) {
- NSCursor* cursor = [CrCoreCursor cursorWithType:type];
- if (cursor)
- return cursor;
- }
+ NSCursor* cursor = [CrCoreCursor cursorWithType:type];
+ if (cursor)
+ return cursor;
return LoadCursor(resource_id, hotspot_x, hotspot_y);
}
@@ -192,12 +189,7 @@ gfx::NativeCursor WebCursor::GetNativeCursor() {
case WebCursorInfo::TypeCross:
return [NSCursor crosshairCursor];
case WebCursorInfo::TypeHand:
- // If >= 10.7, the pointingHandCursor has a shadow so use it. Otherwise
- // use the custom one.
- if (base::mac::IsOSLionOrLater())
- return [NSCursor pointingHandCursor];
- else
- return LoadCursor(IDR_LINK_CURSOR, 6, 1);
+ return [NSCursor pointingHandCursor];
case WebCursorInfo::TypeIBeam:
return [NSCursor IBeamCursor];
case WebCursorInfo::TypeWait:
« no previous file with comments | « content/common/common.sb ('k') | content/common/sandbox_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698