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

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

index 38b67f915a8f29cbbed9dc9318a50b88cd1954ac..66df818e31a61089884f9469d843aaea9022649d 100644

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

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

@@ -160,11 +160,11 @@ BaseTab::BaseTab(TabController* controller)

close_button_ = new TabCloseButton(this);

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

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

- rb.GetBitmapNamed(IDR_TAB_CLOSE));

+ rb.GetImageSkiaNamed(IDR_TAB_CLOSE));

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

- rb.GetBitmapNamed(IDR_TAB_CLOSE_H));

+ rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));

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

- rb.GetBitmapNamed(IDR_TAB_CLOSE_P));

+ rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));

close_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));

// Disable animation so that the red danger sign shows up immediately

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