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/wm/dialog_frame_view.cc | |
| 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/wm/dialog_frame_view.cc')
| -rw-r--r-- | ash/wm/dialog_frame_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/dialog_frame_view.cc b/ash/wm/dialog_frame_view.cc index effd06d..156d357 100644 --- a/ash/wm/dialog_frame_view.cc +++ b/ash/wm/dialog_frame_view.cc @@ -9,6 +9,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" +#include "ui/gfx/image/image.h" #include "ui/gfx/insets.h" #include "ui/views/background.h" #include "ui/views/border.h" @@ -69,11 +70,11 @@ DialogFrameView::DialogFrameView() { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); close_button_ = new views::ImageButton(this); close_button_->SetImage(views::CustomButton::BS_NORMAL, - rb.GetBitmapNamed(IDR_CLOSE_BAR)); + rb.GetImageNamed(IDR_CLOSE_BAR).ToSkBitmap()); close_button_->SetImage(views::CustomButton::BS_HOT, - rb.GetBitmapNamed(IDR_CLOSE_BAR_H)); + rb.GetImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap()); close_button_->SetImage(views::CustomButton::BS_PUSHED, - rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); + rb.GetImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap()); close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); AddChildView(close_button_); |