| Index: base/mac/mac_util.mm
|
| diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm
|
| index bdf45deb5bd2014d90a27879dcc79f8811a8cb59..e1e15dc5382714d61255768112d2e0edf7531c3f 100644
|
| --- a/base/mac/mac_util.mm
|
| +++ b/base/mac/mac_util.mm
|
| @@ -483,6 +483,7 @@ enum {
|
| MOUNTAIN_LION_MINOR_VERSION = 8,
|
| MAVERICKS_MINOR_VERSION = 9,
|
| YOSEMITE_MINOR_VERSION = 10,
|
| + EL_CAPITAN_MINOR_VERSION = 11,
|
| };
|
|
|
| } // namespace
|
| @@ -547,6 +548,18 @@ bool IsOSLaterThanYosemite_DontCallThis() {
|
| }
|
| #endif
|
|
|
| +#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
|
| +
|
| std::string GetModelIdentifier() {
|
| std::string return_string;
|
| ScopedIOObject<io_service_t> platform_expert(
|
|
|