Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

ash/system/audio/tray_volume.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/audio/tray_volume.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_views.h"
@@ skipping 51 matching lines @@
     else if (image_index == kVolumeLevel - 1)
       --image_index;
     // Index 0 is reserved for mute.
     if (delegate->IsAudioMuted())
       image_index = 0;
     else
       ++image_index;
     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;

[sky, 2012/05/14 14:29:22]

Code like this isn't going to update when the dpi changes, right?

[pkotwicz, 2012/05/14 18:04:05]

That's correct unfortunately.

+      image_.ToImageSkia()->extractSubset(&image_skia, region);
+      SetImage(views::CustomButton::BS_NORMAL, &image_skia);
       image_index_ = image_index;
     }
     SchedulePaint();
   }
 
  private:
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = views::ToggleImageButton::GetPreferredSize();
     size.set_height(kTrayPopupItemHeight);
@@ skipping 118 matching lines @@
   if (volume_view_) {
     volume_view_->SetVolumeLevel(percent);
     SetDetailedViewCloseDelay(kTrayPopupAutoCloseDelayInSeconds);
     return;
   }
   PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
 }
 
 }  // namespace internal
 }  // namespace ash