| Index: ui/views/controls/button/image_button.h
|
| diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
|
| index 94f70ba823a7860f3803df8c466fdecd2f4ed6ce..eba2a835a40eff5f07a628558b2fe1fd5ad48b16 100644
|
| --- a/ui/views/controls/button/image_button.h
|
| +++ b/ui/views/controls/button/image_button.h
|
| @@ -44,7 +44,12 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
|
| virtual const gfx::ImageSkia& GetImage(ButtonState state) const;
|
|
|
| // Set the image the button should use for the provided state.
|
| - virtual void SetImage(ButtonState state, const gfx::ImageSkia* image);
|
| + void SetImage(ButtonState state, const gfx::ImageSkia* image);
|
| +
|
| + // As above, but takes a const ref. TODO(estade): all callers should be
|
| + // updated to use this version, and then the implementations can be
|
| + // consolidated.
|
| + virtual void SetImage(ButtonState state, const gfx::ImageSkia& image);
|
|
|
| // Set the background details.
|
| void SetBackground(SkColor color,
|
| @@ -142,7 +147,7 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
|
|
|
| // Overridden from ImageButton:
|
| const gfx::ImageSkia& GetImage(ButtonState state) const override;
|
| - void SetImage(ButtonState state, const gfx::ImageSkia* image) override;
|
| + void SetImage(ButtonState state, const gfx::ImageSkia& image) override;
|
|
|
| // Overridden from View:
|
| bool GetTooltipText(const gfx::Point& p,
|
|
|