diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 19:35:38 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-06 19:35:38 +0000 |
| commit | 85f1ee1d545b7d7874969ea5fe7e63fef7d2b0c5 (patch) | |
| tree | bb253dbea59012936c295988aeb14769100871f9 /ui/views/button_drag_utils.cc | |
| parent | 827dd68138102ad248544775cb50def6bf8a4933 (diff) | |
| download | chromium_src-85f1ee1d545b7d7874969ea5fe7e63fef7d2b0c5.zip chromium_src-85f1ee1d545b7d7874969ea5fe7e63fef7d2b0c5.tar.gz chromium_src-85f1ee1d545b7d7874969ea5fe7e63fef7d2b0c5.tar.bz2 | |
views: 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=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9597022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/button_drag_utils.cc')
| -rw-r--r-- | ui/views/button_drag_utils.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/views/button_drag_utils.cc b/ui/views/button_drag_utils.cc index 4c4c414..5753fdc 100644 --- a/ui/views/button_drag_utils.cc +++ b/ui/views/button_drag_utils.cc @@ -11,6 +11,7 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" +#include "ui/gfx/image/image.h" #include "ui/views/controls/button/text_button.h" namespace button_drag_utils { @@ -31,8 +32,8 @@ void SetURLAndDragImage(const GURL& url, title.empty() ? UTF8ToUTF16(url.spec()) : title); button.set_max_width(kLinkDragImageMaxWidth); if (icon.isNull()) { - button.SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed( - IDR_DEFAULT_FAVICON)); + button.SetIcon(*ui::ResourceBundle::GetSharedInstance().GetImageNamed( + IDR_DEFAULT_FAVICON).ToSkBitmap()); } else { button.SetIcon(icon); } |