diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 22:32:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 22:32:20 +0000 |
| commit | ce1d509fc5218a9283d1afc5f8b146f8640b3930 (patch) | |
| tree | 447052560db8d70f6d55d8e1ab5f6405570cf7a7 /ash/desktop_background | |
| parent | b24c3dc2a27f62eafb54b86f716db92c39b3cba0 (diff) | |
| download | chromium_src-ce1d509fc5218a9283d1afc5f8b146f8640b3930.zip chromium_src-ce1d509fc5218a9283d1afc5f8b146f8640b3930.tar.gz chromium_src-ce1d509fc5218a9283d1afc5f8b146f8640b3930.tar.bz2 | |
ash: Do not use deprecated ResourceBundle::GetBitmapNamed() function.
Instead use the recommended ResourceBundle::GetImageNamed() function and
convert it to the native type appropriately.
BUG=58030
R=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9516002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index bd535a8..44526cb 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -12,6 +12,7 @@ #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/image/image.h" #include "ui/views/widget/widget.h" namespace ash { @@ -21,8 +22,8 @@ namespace internal { // DesktopBackgroundView, public: DesktopBackgroundView::DesktopBackgroundView() { - wallpaper_ = *ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_AURA_WALLPAPER); + wallpaper_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed( + IDR_AURA_WALLPAPER).ToSkBitmap(); wallpaper_.buildMipMap(false); } |