| 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
|
|
|
|
|