chrome/browser/ui/views/find_bar_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/find_bar_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/views/extensions/extension_installed_bubble.cc ('k') | chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/find_bar_view.cc

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

index cff5935328ed3b945354e53178ccee2be7ea982c..3732c60b885be2c113c3e3740f057ed02122d48c 100644

--- a/chrome/browser/ui/views/find_bar_view.cc

+++ b/chrome/browser/ui/views/find_bar_view.cc

@@ -136,11 +136,11 @@ FindBarView::FindBarView(FindBarHost* host)

close_button_->set_tag(CLOSE_TAG);

close_button_->set_focusable(true);

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

- rb.GetImageSkiaNamed(IDR_TAB_CLOSE));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1));

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

- rb.GetImageSkiaNamed(IDR_TAB_CLOSE_H));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_H));

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

- rb.GetImageSkiaNamed(IDR_TAB_CLOSE_P));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_P));

close_button_->SetTooltipText(

l10n_util::GetStringUTF16(IDS_FIND_IN_PAGE_CLOSE_TOOLTIP));

close_button_->SetAccessibleName(

@@ -520,7 +520,7 @@ void FindBarView::OnThemeChanged() {

if (GetThemeProvider()) {

close_button_->SetBackground(

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

- rb.GetImageSkiaNamed(IDR_TAB_CLOSE),

- rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));

+ rb.GetImageSkiaNamed(IDR_CLOSE_1),

+ rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));

}