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

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

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: Rebased 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
« no previous file with comments | « ui/views/controls/image_view.h ('k') | ui/views/controls/scrollbar/bitmap_scroll_bar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ui/views/controls/image_view.h ('k') | ui/views/controls/scrollbar/bitmap_scroll_bar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698