| Index: base/mac/mac_util.mm
|
| diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
|
| index 04311ecf11ec0cb09e38eb02d90a3374bab726fb..60c2f2bb9211dd32f1dc47a13ac0d0c91a259108 100644
|
| --- a/base/mac/mac_util.mm
|
| +++ b/base/mac/mac_util.mm
|
| @@ -610,28 +610,17 @@ 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)
|
| -bool IsOSSnowLeopard() {
|
| - return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION;
|
| -}
|
| -#endif
|
| -
|
| #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
|
| bool IsOSLion() {
|
| return MacOSXMinorVersion() == LION_MINOR_VERSION;
|
| }
|
| #endif
|
|
|
| -#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7)
|
| -bool IsOSLionOrEarlier() {
|
| - return MacOSXMinorVersion() <= LION_MINOR_VERSION;
|
| -}
|
| -#endif
|
| -
|
| #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
|
| bool IsOSLionOrLater() {
|
| return MacOSXMinorVersion() >= LION_MINOR_VERSION;
|
| @@ -650,9 +639,21 @@ bool IsOSMountainLionOrLater() {
|
| }
|
| #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_GT_10_9)
|
| +bool IsOSMavericks() {
|
| + return MacOSXMinorVersion() == MAVERICKS_MINOR_VERSION;
|
| +}
|
| +#endif
|
| +
|
| +#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_9)
|
| +bool IsOSMavericksOrLater() {
|
| + return MacOSXMinorVersion() >= MAVERICKS_MINOR_VERSION;
|
| +}
|
| +#endif
|
| +
|
| +#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_9)
|
| +bool IsOSLaterThanMavericks_DontCallThis() {
|
| + return MacOSXMinorVersion() > MAVERICKS_MINOR_VERSION;
|
| }
|
| #endif
|
|
|
|
|