diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 18:18:38 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 18:18:38 +0000 |
| commit | ba64e2bae9b1d00777a81231148e0f69909a840c (patch) | |
| tree | 8d8168983abb8635bfd5e9471169febbc397d3f4 /ui | |
| parent | 7bf10b0e47e51d9c6d0a5f39a9d0bfad1d78eef4 (diff) | |
| download | chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.zip chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.tar.gz chromium_src-ba64e2bae9b1d00777a81231148e0f69909a840c.tar.bz2 | |
Improve and unify Mac OS X run-time version checks.
Don't use base::SysInfo::OperatingSystemVersionNumbers, because it calls
Gestalt, which has a few bad properties. Introduce new functions that perform
specific version checks.
BUG=85972
TEST=base_unittests MacUtilTest.IsOSEllipsis
Review URL: http://codereview.chromium.org/7144007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/base/resource/resource_bundle_mac.mm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm index 6e294ab..dc17894 100644 --- a/ui/base/resource/resource_bundle_mac.mm +++ b/ui/base/resource/resource_bundle_mac.mm @@ -11,7 +11,6 @@ #include "base/mac/mac_util.h" #include "base/memory/scoped_nsobject.h" #include "base/synchronization/lock.h" -#include "base/sys_info.h" #include "base/sys_string_conversions.h" #include "ui/gfx/image/image.h" @@ -48,13 +47,8 @@ FilePath ResourceBundle::GetResourcesFilePath() { // static FilePath ResourceBundle::GetLargeIconResourcesFilePath() { - int32 major = 0; - int32 minor = 0; - int32 bugfix = 0; - base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix); - - // Only load the large resource pak on if we're running on 10.7 or above. - if (major > 10 || (major == 10 && minor >= 7)) + // Only load the large resource pak when running on 10.7 or later. + if (base::mac::IsOSLionOrLater()) return GetResourcesPakFilePath(@"theme_resources_large", nil); else return FilePath(); |