diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 16:35:58 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-26 16:35:58 +0000 |
commit | 5f5314397438f59cb923beffe74c74c086636133 (patch) | |
tree | 4e66559d543b679b8b5d112764ce6e2a16e017df /app/resource_bundle_mac.mm | |
parent | 67111a4747a162679d2e711c078e54e513411f29 (diff) | |
download | chromium_src-5f5314397438f59cb923beffe74c74c086636133.zip chromium_src-5f5314397438f59cb923beffe74c74c086636133.tar.gz chromium_src-5f5314397438f59cb923beffe74c74c086636133.tar.bz2 |
Add a helper to resource bundle to get an NSImage back.
skia/ext/skia_utils_mac.h includes CoreGraphics/CGColor.h so we have to relay the framework include path so someone can include the header without errors.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/173363
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_mac.mm')
-rw-r--r-- | app/resource_bundle_mac.mm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/resource_bundle_mac.mm b/app/resource_bundle_mac.mm index 22ab274..e96ed54 100644 --- a/app/resource_bundle_mac.mm +++ b/app/resource_bundle_mac.mm @@ -17,6 +17,7 @@ #include "base/path_service.h" #include "base/string_piece.h" #include "base/string_util.h" +#include "skia/ext/skia_utils_mac.h" ResourceBundle::~ResourceBundle() { FreeImages(); @@ -116,3 +117,14 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { data.length() / 2); return msg; } + +NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { + // Currently this doesn't make a cache holding these as NSImages because + // GetBitmapNamed has a cache, and we don't want to double cache. + SkBitmap* bitmap = GetBitmapNamed(resource_id); + if (!bitmap) + return nil; + + NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); + return nsimage; +} |