diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 00:53:32 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 00:53:32 +0000 |
| commit | 546882bd3fae21df702efcaaec50ec168ec6bf86 (patch) | |
| tree | 5f5c77beabb57eb7bb3d91c9c423b81998017336 /ui/views | |
| parent | 9bba0e83dd8d8f2b2196a7985cc6fa704fae0cc3 (diff) | |
| download | chromium_src-546882bd3fae21df702efcaaec50ec168ec6bf86.zip chromium_src-546882bd3fae21df702efcaaec50ec168ec6bf86.tar.gz chromium_src-546882bd3fae21df702efcaaec50ec168ec6bf86.tar.bz2 | |
Add GetImageSkiaNamed to resource_bundle and theme_provider.
This makes converting use of SkBitmap into ImageSkia easier
Bug=124566
Test=Manual
Review URL: https://chromiumcodereview.appspot.com/10388064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
| -rw-r--r-- | ui/views/widget/default_theme_provider.cc | 5 | ||||
| -rw-r--r-- | ui/views/widget/default_theme_provider.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ui/views/widget/default_theme_provider.cc b/ui/views/widget/default_theme_provider.cc index df33ee6..469410b 100644 --- a/ui/views/widget/default_theme_provider.cc +++ b/ui/views/widget/default_theme_provider.cc @@ -5,6 +5,7 @@ #include "ui/views/widget/default_theme_provider.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/image/image_skia.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "ui/views/widget/native_widget_win.h" @@ -20,6 +21,10 @@ SkBitmap* DefaultThemeProvider::GetBitmapNamed(int id) const { return ResourceBundle::GetSharedInstance().GetBitmapNamed(id); } +gfx::ImageSkia* DefaultThemeProvider::GetImageSkiaNamed(int id) const { + return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id); +} + SkColor DefaultThemeProvider::GetColor(int id) const { // Return debugging-blue. return 0xff0000ff; diff --git a/ui/views/widget/default_theme_provider.h b/ui/views/widget/default_theme_provider.h index c1df943..ca135b2 100644 --- a/ui/views/widget/default_theme_provider.h +++ b/ui/views/widget/default_theme_provider.h @@ -27,6 +27,7 @@ class VIEWS_EXPORT DefaultThemeProvider : public ui::ThemeProvider { // Overridden from ui::ThemeProvider: virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE; + virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE; virtual SkColor GetColor(int id) const OVERRIDE; virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE; virtual bool ShouldUseNativeFrame() const OVERRIDE; |