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

Unified Diff: ash/system/tray_caps_lock.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_accessibility.cc ('k') | ash/system/tray_update.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray_caps_lock.cc
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index 729fc88c0f1b560920d5ec8b07daff2f2f2f200e..466fa77b5398b1b754d7c5bca80a7fceff4341a8 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -35,7 +35,7 @@ class CapsLockDefaultView : public ActionableView {
FixedSizedImageView* image =
new FixedSizedImageView(0, kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
- ToSkBitmap());
+ ToImageSkia());
AddChildView(image);
text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ -131,7 +131,7 @@ views::View* TrayCapsLock::CreateDetailedView(user::LoginStatus status) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
views::ImageView* image = new views::ImageView;
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
- ToSkBitmap());
+ ToImageSkia());
detailed_->AddChildView(image);
« no previous file with comments | « ash/system/tray_accessibility.cc ('k') | ash/system/tray_update.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698