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

Unified Diff: ash/wm/frame_painter.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/wm/frame_painter.cc
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 6bdc426c63e837acd46e9f7560321684ee7469e2..1258927896a4fdd21e54719a8534ad7f9b1373f0 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -558,11 +558,11 @@ void FramePainter::SetButtonImages(views::ImageButton* button,
int pushed_bitmap_id) {
ui::ThemeProvider* theme_provider = frame_->GetThemeProvider();
button->SetImage(views::CustomButton::BS_NORMAL,
- theme_provider->GetBitmapNamed(normal_bitmap_id));
+ theme_provider->GetImageSkiaNamed(normal_bitmap_id));
button->SetImage(views::CustomButton::BS_HOT,
- theme_provider->GetBitmapNamed(hot_bitmap_id));
+ theme_provider->GetImageSkiaNamed(hot_bitmap_id));
button->SetImage(views::CustomButton::BS_PUSHED,
- theme_provider->GetBitmapNamed(pushed_bitmap_id));
+ theme_provider->GetImageSkiaNamed(pushed_bitmap_id));
}
int FramePainter::GetTitleOffsetX() const {

Powered by Google App Engine
This is Rietveld 408576698