chrome/browser/ui/views/download/download_shelf_view.cc - Issue 12742013: Inconsistent use of [x] close panel icon. Code changes.

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 12742013: Inconsistent use of [x] close panel icon. Code changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_217094_3

Patch Set: Created 7 years, 9 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/gtk/website_settings/website_settings_popup_gtk.cc ('k') | chrome/browser/ui/views/extensions/bundle_installed_bubble.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 5f1ad4313bb661a4900e7d1f5bf57192051c0258..ec700de58550b1f26f87001bd0ab0bb414a0c199 100644

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

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

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

close_button_ = new views::ImageButton(this);

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

- rb.GetImageSkiaNamed(IDR_CLOSE_BAR));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1));

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

- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_H));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_H));

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

- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_P));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_P));

close_button_->SetAccessibleName(

l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));

AddChildView(close_button_);

@@ -370,8 +370,8 @@ void DownloadShelfView::UpdateColorsFromTheme() {

GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));

close_button_->SetBackground(

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

- rb.GetImageSkiaNamed(IDR_CLOSE_BAR),

- rb.GetImageSkiaNamed(IDR_CLOSE_BAR_MASK));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1),

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));

}