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

Unified Diff: ash/system/tray_update.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/system/tray_caps_lock.cc ('k') | ash/wm/dialog_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_update.cc
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index d6f03afefe341cf38cf77310377e99be322a0e75..55318e1b5986b3400915ac06048b593987577145 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -45,7 +45,7 @@ class UpdateView : public ash::internal::ActionableView {
views::ImageView* image =
new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_UPDATE_DARK).
- ToSkBitmap());
+ ToImageSkia());
AddChildView(image);
AddChildView(new views::Label(
« no previous file with comments | « ash/system/tray_caps_lock.cc ('k') | ash/wm/dialog_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698