Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: ui/views/controls/image_view.h

Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698