chrome/browser/ui/views/tabs/tab.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: chrome/browser/ui/views/tabs/tab.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/tabs/tab.cc

diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc

index 06172b8bf6b21a876609f123a25de82a08e677b3..2a2184e512a7fca49cbd6a07d6eb563fa52a5f22 100644

--- a/chrome/browser/ui/views/tabs/tab.cc

+++ b/chrome/browser/ui/views/tabs/tab.cc

@@ -326,8 +326,8 @@ void Tab::OnPaint(gfx::Canvas* canvas) {

close_button_color_ = title_color;

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

close_button()->SetBackground(close_button_color_,

- rb.GetBitmapNamed(IDR_TAB_CLOSE),

- rb.GetBitmapNamed(IDR_TAB_CLOSE_MASK));

+ rb.GetImageSkiaNamed(IDR_TAB_CLOSE),

+ rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));

}

« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.cc ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »