Merge 276752 "Update OS version functions."

base/mac/mac_util.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/mac/mac_util.h"
 
 #import <Cocoa/Cocoa.h>
 #import <IOKit/IOKitLib.h>
 
 #include <errno.h>
@@ skipping 451 matching lines @@
   int darwin_major_version = DarwinMajorVersionInternal();
 
   // The Darwin major version is always 4 greater than the Mac OS X minor
   // version for Darwin versions beginning with 6, corresponding to Mac OS X
   // 10.2. Since this correspondence may change in the future, warn when
   // encountering a version higher than anything seen before. Older Darwin
   // versions, or versions that can't be determined, result in
   // immediate death.
   CHECK(darwin_major_version >= 6);
   int mac_os_x_minor_version = darwin_major_version - 4;
-  DLOG_IF(WARNING, darwin_major_version > 13) << "Assuming Darwin "
+  DLOG_IF(WARNING, darwin_major_version > 14) << "Assuming Darwin "
       << base::IntToString(darwin_major_version) << " is Mac OS X 10."
       << base::IntToString(mac_os_x_minor_version);
 
   return mac_os_x_minor_version;
 }
 
 // Returns the running system's Mac OS X minor version. This is the |y| value
 // in 10.y or 10.y.z.
 int MacOSXMinorVersion() {
   static int mac_os_x_minor_version = MacOSXMinorVersionInternal();
   return mac_os_x_minor_version;
 }
 
 enum {
   SNOW_LEOPARD_MINOR_VERSION = 6,
   LION_MINOR_VERSION = 7,
   MOUNTAIN_LION_MINOR_VERSION = 8,
   MAVERICKS_MINOR_VERSION = 9,
+  YOSEMITE_MINOR_VERSION = 10,
 };
 
 }  // namespace
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_7)
 bool IsOSSnowLeopard() {
   return MacOSXMinorVersion() == SNOW_LEOPARD_MINOR_VERSION;
 }
 #endif
 
@@ skipping 26 matching lines @@
   return MacOSXMinorVersion() == MAVERICKS_MINOR_VERSION;
 }
 #endif
 
 #if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_9)
 bool IsOSMavericksOrLater() {
   return MacOSXMinorVersion() >= MAVERICKS_MINOR_VERSION;
 }
 #endif
 
-#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_9)
-bool IsOSLaterThanMavericks_DontCallThis() {
-  return MacOSXMinorVersion() > MAVERICKS_MINOR_VERSION;
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_10)
+bool IsOSYosemite() {
+  return MacOSXMinorVersion() == YOSEMITE_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GE_10_10)
+bool IsOSYosemiteOrLater() {
+  return MacOSXMinorVersion() >= YOSEMITE_MINOR_VERSION;
+}
+#endif
+
+#if !defined(BASE_MAC_MAC_UTIL_H_INLINED_GT_10_10)
+bool IsOSLaterThanYosemite_DontCallThis() {
+  return MacOSXMinorVersion() > YOSEMITE_MINOR_VERSION;
 }
 #endif
 
 std::string GetModelIdentifier() {
   std::string return_string;
   ScopedIOObject<io_service_t> platform_expert(
       IOServiceGetMatchingService(kIOMasterPortDefault,
                                   IOServiceMatching("IOPlatformExpertDevice")));
   if (platform_expert) {
     ScopedCFTypeRef<CFDataRef> model_data(
@@ skipping 28 matching lines @@
           StringPiece(begin + comma_loc + 1, ident.end()), &minor_tmp))
     return false;
   *type = ident.substr(0, number_loc);
   *major = major_tmp;
   *minor = minor_tmp;
   return true;
 }
 
 }  // namespace mac
 }  // namespace base