Chromium Code Reviews| Index: third_party/WebKit/Source/platform/mac/VersionUtilMac.h |
| diff --git a/third_party/WebKit/Source/platform/mac/VersionUtilMac.h b/third_party/WebKit/Source/platform/mac/VersionUtilMac.h |
| index ccff619df8d9d466d8dc4d1e3271d87e4008d04b..4384da9274ab1771f075db6bbad2a6ab811f52da 100644 |
| --- a/third_party/WebKit/Source/platform/mac/VersionUtilMac.h |
| +++ b/third_party/WebKit/Source/platform/mac/VersionUtilMac.h |
| @@ -7,16 +7,25 @@ |
| #include "platform/PlatformExport.h" |
| +#include <AvailabilityMacros.h> |
| + |
| namespace blink { |
| -// Mavericks is Mac OS X 10.9, Darwin 13. |
| -PLATFORM_EXPORT bool IsOSMavericks(); |
| +namespace internal { |
| + |
| +PLATFORM_EXPORT int MacOSXMinorVersion(); |
|
Sidney San Martín
2016/08/24 20:07:13
dglazkov@: These functions also exist in base/mac/
|
| + |
| +template <int V, int ID> |
| +constexpr bool IsOS() |
| +{ |
| + return (!ID || MAC_OS_X_VERSION_MIN_REQUIRED <= ID) && MacOSXMinorVersion() == V; |
| +} |
| -// Yosemite is Mac OS X 10.10, Darwin 14. |
| -PLATFORM_EXPORT bool IsOSYosemite(); |
| +} // namespace internal |
| -// El Capitan is Mac OS X 10.11, Darwin 15. |
| -PLATFORM_EXPORT bool IsOSElCapitan(); |
| +const auto IsOS10_9 = internal::IsOS<9, MAC_OS_X_VERSION_10_9>; |
| +const auto IsOS10_10 = internal::IsOS<10, MAC_OS_X_VERSION_10_10>; |
| +const auto IsOS10_11 = internal::IsOS<11, MAC_OS_X_VERSION_10_11>; |
| } // namespace blink |