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

Unified Diff: ash/system/audio/tray_volume.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 | « ash/monitor/secondary_monitor_view.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/audio/tray_volume.cc
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index b43f1218deff505379c7f30501f6e70e853dd043..fba2fe871c0c8307da27b1e97d94558d5f3ab7f9 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -69,9 +69,9 @@ class VolumeButton : public views::ToggleImageButton {
if (image_index != image_index_) {
SkIRect region = SkIRect::MakeXYWH(0, image_index * kVolumeImageHeight,
kVolumeImageWidth, kVolumeImageHeight);
- SkBitmap bitmap;
- image_.ToSkBitmap()->extractSubset(&bitmap, region);
- SetImage(views::CustomButton::BS_NORMAL, &bitmap);
+ gfx::ImageSkia image_skia;
+ image_.ToImageSkia()->extractSubset(&image_skia, region);
+ SetImage(views::CustomButton::BS_NORMAL, &image_skia);
image_index_ = image_index;
}
SchedulePaint();
« no previous file with comments | « ash/monitor/secondary_monitor_view.cc ('k') | ash/system/bluetooth/tray_bluetooth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698