| Index: base/mac/mac_util.mm
|
| diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
|
| index 6dca874c08eeeb10ba9f8519be7babd4542d0356..9789835eba297786a26974c542daa4edf6a3012c 100644
|
| --- a/base/mac/mac_util.mm
|
| +++ b/base/mac/mac_util.mm
|
| @@ -456,28 +456,14 @@ int MacOSXMinorVersion() {
|
| }
|
|
|
| enum {
|
| - SNOW_LEOPARD_MINOR_VERSION = 6,
|
| - LION_MINOR_VERSION = 7,
|
| - MOUNTAIN_LION_MINOR_VERSION = 8,
|
| MAVERICKS_MINOR_VERSION = 9,
|
| YOSEMITE_MINOR_VERSION = 10,
|
| EL_CAPITAN_MINOR_VERSION = 11,
|
| + SIERRA_MINOR_VERSION = 12,
|
| };
|
|
|
| } // namespace
|
|
|
| -#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8)
|
| -bool IsOSMountainLion() {
|
| - return MacOSXMinorVersion() == MOUNTAIN_LION_MINOR_VERSION;
|
| -}
|
| -#endif
|
| -
|
| -#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_8)
|
| -bool IsOSMountainLionOrLater() {
|
| - return MacOSXMinorVersion() >= MOUNTAIN_LION_MINOR_VERSION;
|
| -}
|
| -#endif
|
| -
|
| #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_9)
|
| bool IsOSMavericks() {
|
| return MacOSXMinorVersion() == MAVERICKS_MINOR_VERSION;
|
| @@ -514,9 +500,21 @@ bool IsOSElCapitanOrLater() {
|
| }
|
| #endif
|
|
|
| -#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_11)
|
| -bool IsOSLaterThanElCapitan_DontCallThis() {
|
| - return MacOSXMinorVersion() > EL_CAPITAN_MINOR_VERSION;
|
| +#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_12)
|
| +bool IsOSSierra() {
|
| + return MacOSXMinorVersion() == SIERRA_MINOR_VERSION;
|
| +}
|
| +#endif
|
| +
|
| +#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_12)
|
| +bool IsOSSierraOrLater() {
|
| + return MacOSXMinorVersion() >= SIERRA_MINOR_VERSION;
|
| +}
|
| +#endif
|
| +
|
| +#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_12)
|
| +bool IsOSLaterThanSierra_DontCallThis() {
|
| + return MacOSXMinorVersion() > SIERRA_MINOR_VERSION;
|
| }
|
| #endif
|
|
|
|
|