| Index: ui/views/controls/image_view.h
|
| diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
|
| index 8827d4ecfc264dd3c395390d83ad45121bd38258..c4dc13a650bad78e2d100f5a5b36d7aabe9f5042 100644
|
| --- a/ui/views/controls/image_view.h
|
| +++ b/ui/views/controls/image_view.h
|
| @@ -7,6 +7,7 @@
|
| #pragma once
|
|
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| +#include "ui/gfx/image/image_skia.h"
|
| #include "ui/views/view.h"
|
|
|
| namespace gfx {
|
| @@ -39,10 +40,10 @@ class VIEWS_EXPORT ImageView : public View {
|
| // Set the bitmap that should be displayed.
|
| void SetImage(const SkBitmap& bm);
|
|
|
| - // Set the bitmap that should be displayed from a pointer. Reset the image
|
| + // Set the image that should be displayed from a pointer. Reset the image
|
| // if the pointer is NULL. The pointer contents is copied in the receiver's
|
| // bitmap.
|
| - void SetImage(const SkBitmap* bm);
|
| + void SetImage(const gfx::ImageSkia* image_skia);
|
|
|
| // Returns the bitmap currently displayed or NULL of none is currently set.
|
| // The returned bitmap is still owned by the ImageView.
|
|
|