| Index: ui/views/controls/image_view.cc
|
| diff --git a/ui/views/controls/image_view.cc b/ui/views/controls/image_view.cc
|
| index 64ccf5b207a1588377018bfde7fbfdd7ca6abb55..e09603df32d2546b674251bc672c85a3125d331d 100644
|
| --- a/ui/views/controls/image_view.cc
|
| +++ b/ui/views/controls/image_view.cc
|
| @@ -30,9 +30,9 @@ void ImageView::SetImage(const SkBitmap& bm) {
|
| SchedulePaint();
|
| }
|
|
|
| -void ImageView::SetImage(const SkBitmap* bm) {
|
| - if (bm) {
|
| - SetImage(*bm);
|
| +void ImageView::SetImage(const gfx::ImageSkia* image_skia) {
|
| + if (image_skia) {
|
| + SetImage(*image_skia);
|
| } else {
|
| SkBitmap t;
|
| SetImage(t);
|
|
|