Chromium Code Reviews| Index: ui/base/resource/resource_bundle_mac.mm |
| =================================================================== |
| --- ui/base/resource/resource_bundle_mac.mm (revision 88826) |
| +++ ui/base/resource/resource_bundle_mac.mm (working copy) |
| @@ -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.h" |
| @@ -48,13 +47,8 @@ |
| // 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. |
|
Avi (use Gerrit)
2011/06/14 17:50:17
drop "on": "... pak if we're running ..."
Mark Mentovai
2011/06/14 18:00:18
Avi wrote:
|
| - if (major > 10 || (major == 10 && minor >= 7)) |
| + if (base::mac::IsOSLionOrLater()) |
| return GetResourcesPakFilePath(@"theme_resources_large", nil); |
| else |
| return FilePath(); |