ash/wm/frame_painter.cc - Issue 10382144: Change SetImage, SetBackground, and SetToggledImage to take in a gfx::ImageSkia

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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: ash/wm/frame_painter.cc

diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc

index 7e84960f80a4204b9eff135334d1dc93b8a18c7c..f35db438f55d7892d726576757e7ba246fec79ab 100644

--- a/ash/wm/frame_painter.cc

+++ b/ash/wm/frame_painter.cc

@@ -569,11 +569,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 {

« no previous file with comments | « ash/wm/dialog_frame_view.cc ('k') | chrome/browser/chromeos/login/message_bubble.cc » ('j') | no next file with comments »