| Index: base/mac/mac_util.h
|
| diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
|
| index 4fefe6c5ee80976d9788193dbd5e1c9b6a2c6d29..3d50d6145285eb14ddec7a3f9c563670e0b8c4c2 100644
|
| --- a/base/mac/mac_util.h
|
| +++ b/base/mac/mac_util.h
|
| @@ -138,11 +138,19 @@ BASE_EXPORT bool IsOSSnowLeopardOrLater();
|
|
|
| // Lion is Mac OS X 10.7, Darwin 11.
|
| BASE_EXPORT bool IsOSLion();
|
| +BASE_EXPORT bool IsOSLionOrEarlier();
|
| BASE_EXPORT bool IsOSLionOrLater();
|
|
|
| +// Mountain Lion is Mac OS X 10.8, Darwin 12.
|
| +BASE_EXPORT bool IsOSMountainLion();
|
| +BASE_EXPORT bool IsOSMountainLionOrLater();
|
| +
|
| // This should be infrequently used. It only makes sense to use this to avoid
|
| // codepaths that are very likely to break on future (unreleased, untested,
|
| // unborn) OS releases.
|
| +BASE_EXPORT
|
| + bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement();
|
| +// TODO(rsesek|avi): Remove when allocators gonna allocate.
|
| BASE_EXPORT bool IsOSLaterThanLion();
|
|
|
| // When the deployment target is set, the code produced cannot run on earlier
|
| @@ -170,9 +178,26 @@ inline bool IsOSLionOrLater() { return true; }
|
| MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_7
|
| #define BASE_MAC_MAC_UTIL_H_INLINED_GT_10_7
|
| inline bool IsOSLion() { return false; }
|
| +inline bool IsOSLionOrEarlier() { return false; }
|
| inline bool IsOSLaterThanLion() { return true; }
|
| #endif
|
|
|
| +#if defined(MAC_OS_X_VERSION_10_8) && \
|
| + MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_8
|
| +#define BASE_MAC_MAC_UTIL_H_INLINED_GE_10_8
|
| +inline bool IsOSMountainLionOrLater() { return true; }
|
| +#endif
|
| +
|
| +#if defined(MAC_OS_X_VERSION_10_8) && \
|
| + MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_8
|
| +#define BASE_MAC_MAC_UTIL_H_INLINED_GT_10_8
|
| +inline bool IsOSMountainLion() { return false; }
|
| +inline bool IsOSDangerouslyLaterThanMountainLionForUseByCFAllocatorReplacement()
|
| +{
|
| + return true;
|
| +}
|
| +#endif
|
| +
|
| // Retrieve the system's model identifier string from the IOKit registry:
|
| // for example, "MacPro4,1", "MacBookPro6,1". Returns empty string upon
|
| // failure.
|
|
|