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

Unified Diff: base/mac/mac_util.mm

Issue 25286002: Update OS version functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years, 3 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
Index: base/mac/mac_util.mm
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
index 04311ecf11ec0cb09e38eb02d90a3374bab726fb..27bfeb16a500e3c0fa58141d4165343f34db6631 100644
--- a/base/mac/mac_util.mm
+++ b/base/mac/mac_util.mm
@@ -610,49 +610,68 @@ enum {
SNOW_LEOPARD_MINOR_VERSION = 6,
LION_MINOR_VERSION = 7,
MOUNTAIN_LION_MINOR_VERSION = 8,
+ MAVERICKS_MINOR_VERSION = 9,
};
} // namespace
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSSNOWLEOPARD)
bool IsOSSnowLeopard() {
return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSLION)
bool IsOSLion() {
return MacOSXMinorVersion() == LION_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSLIONOREARLIER)
bool IsOSLionOrEarlier() {
return MacOSXMinorVersion() <= LION_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSLIONORLATER)
bool IsOSLionOrLater() {
return MacOSXMinorVersion() >= LION_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSMOUNTAINLION)
bool IsOSMountainLion() {
return MacOSXMinorVersion() == MOUNTAIN_LION_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_8)
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSMOUNTAINLIONOREARLIER)
+bool IsOSMountainLionOrEarlier() {
+ return MacOSXMinorVersion() <= MOUNTAIN_LION_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSMOUNTAINLIONORLATER)
bool IsOSMountainLionOrLater() {
return MacOSXMinorVersion() >= MOUNTAIN_LION_MINOR_VERSION;
}
#endif
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8)
-bool IsOSLaterThanMountainLion_DontCallThis() {
- return MacOSXMinorVersion() > MOUNTAIN_LION_MINOR_VERSION;
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSMAVERICKS)
+bool IsOSMavericks() {
+ return MacOSXMinorVersion() == MAVERICKS_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISOSMAVERICKSORLATER)
+bool IsOSMavericksOrLater() {
+ return MacOSXMinorVersion() >= MAVERICKS_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_ISLATERTHANOSMAVERICKS)
+bool IsOSLaterThanMavericks_DontCallThis() {
+ return MacOSXMinorVersion() > MAVERICKS_MINOR_VERSION;
}
#endif

Powered by Google App Engine
This is Rietveld 408576698