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

Unified Diff: chrome/browser/ui/views/frame/app_non_client_frame_view_aura.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
Index: chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
index e23cf5f3221ec40f02858cd75ef369d2553682d7..d583cf3eb652621af19107ac5f55a46ab60dffdb 100644
--- a/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_aura.cc
@@ -140,11 +140,11 @@ class AppNonClientFrameViewAura::ControlView
int hot_bitmap_id, int pushed_bitmap_id) {
ui::ThemeProvider* theme_provider = 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));
}
AppNonClientFrameViewAura* owner_;
« no previous file with comments | « chrome/browser/ui/views/find_bar_view.cc ('k') | chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698