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

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 25286002: Update OS version functions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: uma Created 7 years, 3 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') | content/renderer/renderer_main_platform_delegate_mac.mm » ('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 83c1c06cd9a9f37bc0f747264f7193640aa7e168..0303b8467f1e4017a83b0cd9e517c40c98067dca 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -57,22 +57,27 @@ enum CatSixtyFour {
LION_64,
MOUNTAIN_LION_32, // Unexpected, Mountain Lion requires a 64-bit CPU.
MOUNTAIN_LION_64,
+ MAVERICKS_32, // Unexpected, Mavericks requires a 64-bit CPU.
+ MAVERICKS_64,
// DON'T add new constants here. It's important to keep the constant values,
// um, constant. Add new constants at the bottom.
- // Newer than any known cat.
- FUTURE_CAT_32, // Unexpected, it's unlikely Apple will un-obsolete old CPUs.
- FUTURE_CAT_64,
-
// What if the bitsiness of the CPU can't be determined?
SABER_TOOTHED_CAT_DUNNO,
SNOW_LEOPARD_DUNNO,
LION_DUNNO,
MOUNTAIN_LION_DUNNO,
+ MAVERICKS_DUNNO,
+
+ // Newer than any known cat.
+ FUTURE_CAT_32, // Unexpected, it's unlikely Apple will un-obsolete old CPUs.
Nico 2013/10/01 20:57:45 Should this be FUTURE_CALI now? :-P
+ FUTURE_CAT_64,
FUTURE_CAT_DUNNO,
- // Add new constants here.
+ // As new versions of Mac OS X are released with sillier and sillier names,
Mark Mentovai 2013/10/01 20:25:37 :)
+ // rename the FUTURE_CAT enum values to match those names, and re-create
+ // FUTURE_CAT_[32|64|DUNNO] here.
CAT_SIXTY_FOUR_MAX
};
@@ -114,7 +119,11 @@ CatSixtyFour CatSixtyFourValue() {
return cpu64_known ? (cpu64 ? MOUNTAIN_LION_64 : MOUNTAIN_LION_32) :
MOUNTAIN_LION_DUNNO;
}
- if (base::mac::IsOSLaterThanMountainLion_DontCallThis()) {
+ if (base::mac::IsOSMavericks()) {
+ return cpu64_known ? (cpu64 ? MAVERICKS_64 : MAVERICKS_32) :
+ MAVERICKS_DUNNO;
+ }
+ if (base::mac::IsOSLaterThanMavericks_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') | content/renderer/renderer_main_platform_delegate_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698