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

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

index f98ab0087cacb53109869e743df02f412f60614e..31dd6d32bce4a4f351cf157a3da0f1574523d9b0 100644

--- a/ash/wm/dialog_frame_view.cc

+++ b/ash/wm/dialog_frame_view.cc

@@ -72,11 +72,11 @@ DialogFrameView::DialogFrameView() {

ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

close_button_ = new views::ImageButton(this);

close_button_->SetImage(views::CustomButton::BS_NORMAL,

- rb.GetImageNamed(IDR_CLOSE_BAR).ToSkBitmap());

+ rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());

close_button_->SetImage(views::CustomButton::BS_HOT,

- rb.GetImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap());

+ rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());

close_button_->SetImage(views::CustomButton::BS_PUSHED,

- rb.GetImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap());

+ rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());

close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,

views::ImageButton::ALIGN_MIDDLE);

AddChildView(close_button_);

« no previous file with comments | « ash/system/tray_update.cc ('k') | ash/wm/frame_painter.cc » ('j') | no next file with comments »