chrome/browser/ui/views/download/download_shelf_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: chrome/browser/ui/views/download/download_shelf_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

« no previous file with comments | « chrome/browser/ui/views/critical_notification_bubble_view.cc ('k') | chrome/browser/ui/views/download/download_started_animation_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/download/download_shelf_view.cc

diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc

index 1b7bc9410d832428db8fdd4141d56193aa574119..84be7d2da23982d612982bef5117f765f36ac1b6 100644

--- a/chrome/browser/ui/views/download/download_shelf_view.cc

+++ b/chrome/browser/ui/views/download/download_shelf_view.cc

@@ -308,7 +308,7 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add,

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

arrow_image_ = new views::ImageView();

- arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON));

+ arrow_image_->SetImage(rb.GetImageSkiaNamed(IDR_DOWNLOADS_FAVICON));

AddChildView(arrow_image_);

show_all_view_ = new views::Link(

@@ -321,11 +321,11 @@ void DownloadShelfView::ViewHierarchyChanged(bool is_add,

close_button_ = new views::ImageButton(this);

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

- rb.GetBitmapNamed(IDR_CLOSE_BAR));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR));

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

- rb.GetBitmapNamed(IDR_CLOSE_BAR_H));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));

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

- rb.GetBitmapNamed(IDR_CLOSE_BAR_P));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));

close_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));

UpdateButtonColors();

@@ -365,8 +365,8 @@ void DownloadShelfView::UpdateButtonColors() {

if (GetThemeProvider()) {

close_button_->SetBackground(

GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),

- rb.GetBitmapNamed(IDR_CLOSE_BAR),

- rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR),

+ rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK));

}