| Index: base/mac/mac_util.h
|
| diff --git a/base/mac/mac_util.h b/base/mac/mac_util.h
|
| index c5c2abf6cc08b082decea97f02e10237f6a0a485..c72c5f143363bd8e904599a7fdcac9b2eb95a03e 100644
|
| --- a/base/mac/mac_util.h
|
| +++ b/base/mac/mac_util.h
|
| @@ -113,11 +113,6 @@ BASE_EXPORT bool RemoveQuarantineAttribute(const FilePath& file_path);
|
| // "OrLater" variants to those that check for a specific version, unless you
|
| // know for sure that you need to check for a specific version.
|
|
|
| -// 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 IsOSMountainLionOrEarlier();
|
| @@ -144,7 +139,6 @@ BASE_EXPORT bool IsOSLaterThanElCapitan_DontCallThis();
|
|
|
| // Inline functions that are redundant due to version ranges being mutually-
|
| // exclusive.
|
| -inline bool IsOSLionOrEarlier() { return !IsOSMountainLionOrLater(); }
|
| inline bool IsOSMountainLionOrEarlier() { return !IsOSMavericksOrLater(); }
|
| inline bool IsOSMavericksOrEarlier() { return !IsOSYosemiteOrLater(); }
|
| inline bool IsOSYosemiteOrEarlier() { return !IsOSElCapitanOrLater(); }
|
| @@ -154,18 +148,6 @@ inline bool IsOSYosemiteOrEarlier() { return !IsOSElCapitanOrLater(); }
|
| // constant-value inline functions. The MAC_OS_X_VERSION_MIN_REQUIRED macro
|
| // contains the value of the deployment target.
|
|
|
| -#if defined(MAC_OS_X_VERSION_10_7) && \
|
| - MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
|
| -#define BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7
|
| -inline bool IsOSLionOrLater() { return true; }
|
| -#endif
|
| -
|
| -#if defined(MAC_OS_X_VERSION_10_7) && \
|
| - 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; }
|
| -#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
|
|
|