Index: base/mac/mac_util.mm |
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm |
index bdf45deb5bd2014d90a27879dcc79f8811a8cb59..647faf3866f0d52d982e532e8cd2568ef12efce5 100644 |
--- a/base/mac/mac_util.mm |
+++ b/base/mac/mac_util.mm |
@@ -463,7 +463,7 @@ int MacOSXMinorVersionInternal() { |
// immediate death. |
CHECK(darwin_major_version >= 6); |
int mac_os_x_minor_version = darwin_major_version - 4; |
- DLOG_IF(WARNING, darwin_major_version > 14) << "Assuming Darwin " |
+ DLOG_IF(WARNING, darwin_major_version > 15) << "Assuming Darwin " |
<< base::IntToString(darwin_major_version) << " is Mac OS X 10." |
<< base::IntToString(mac_os_x_minor_version); |
@@ -483,6 +483,7 @@ enum { |
MOUNTAIN_LION_MINOR_VERSION = 8, |
MAVERICKS_MINOR_VERSION = 9, |
YOSEMITE_MINOR_VERSION = 10, |
+ EL_CAPITAN_MINOR_VERSION = 11, |
}; |
} // namespace |
@@ -541,9 +542,21 @@ bool IsOSYosemiteOrLater() { |
} |
#endif |
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_10) |
-bool IsOSLaterThanYosemite_DontCallThis() { |
- return MacOSXMinorVersion() > YOSEMITE_MINOR_VERSION; |
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_11) |
+bool IsOSElCapitan() { |
+ return MacOSXMinorVersion() == EL_CAPITAN_MINOR_VERSION; |
+} |
+#endif |
+ |
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_11) |
+bool IsOSElCapitanOrLater() { |
+ return MacOSXMinorVersion() >= EL_CAPITAN_MINOR_VERSION; |
+} |
+#endif |
+ |
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_11) |
+bool IsOSLaterThanElCapitan_DontCallThis() { |
+ return MacOSXMinorVersion() > EL_CAPITAN_MINOR_VERSION; |
} |
#endif |