Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5755)

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 325423005: Update OS version functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: d'oh Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/test/expectations/expectation.cc ('k') | sandbox/mac/os_compatibility.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 61a1faae2aba2b799ea2fbf37a4871366f7f37c5..e525ed09df8c6c85ff43898142ad3e91899813fe 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -60,6 +60,11 @@ enum CatSixtyFour {
MOUNTAIN_LION_DUNNO,
MAVERICKS_DUNNO,
+ // More known cats.
+ YOSEMITE_32, // Unexpected, Yosemite requires a 64-bit CPU.
+ YOSEMITE_64,
+ YOSEMITE_DUNNO,
+
// Newer than any known cat.
FUTURE_CAT_32, // Unexpected, it's unlikely Apple will un-obsolete old CPUs.
FUTURE_CAT_64,
@@ -113,7 +118,11 @@ CatSixtyFour CatSixtyFourValue() {
return cpu64_known ? (cpu64 ? MAVERICKS_64 : MAVERICKS_32) :
MAVERICKS_DUNNO;
}
- if (base::mac::IsOSLaterThanMavericks_DontCallThis()) {
+ if (base::mac::IsOSYosemite()) {
+ return cpu64_known ? (cpu64 ? YOSEMITE_64 : YOSEMITE_32) :
+ YOSEMITE_DUNNO;
+ }
+ if (base::mac::IsOSLaterThanYosemite_DontCallThis()) {
return cpu64_known ? (cpu64 ? FUTURE_CAT_64 : FUTURE_CAT_32) :
FUTURE_CAT_DUNNO;
}
« no previous file with comments | « base/test/expectations/expectation.cc ('k') | sandbox/mac/os_compatibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698