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

Unified Diff: ash/system/brightness/tray_brightness.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: 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: ash/system/brightness/tray_brightness.cc
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc
index b52e97855ae436059d6992a6fadd83a3d38f931a..33ced238cb0e604b287680efb3c15135901c19ed 100644
--- a/ash/system/brightness/tray_brightness.cc
+++ b/ash/system/brightness/tray_brightness.cc
@@ -52,7 +52,7 @@ class BrightnessView : public views::View,
views::ImageView* icon = new FixedSizedImageView(0, kTrayPopupItemHeight);
gfx::Image image = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
IDR_AURA_UBER_TRAY_BRIGHTNESS);
- icon->SetImage(image.ToSkBitmap());
+ icon->SetImage(image.ToImageSkia());
AddChildView(icon);
slider_ = new views::Slider(this, views::Slider::HORIZONTAL);

Powered by Google App Engine
This is Rietveld 408576698