Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7822)

Unified Diff: chrome/browser/ui/views/tabs/tab.cc

Issue 12634025: Inconsistent use of [x] close panel icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_173251
Patch Set: Fixed compile on linux, mac and win 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
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 33625dbc732997a32d12734db6ccefba91388e57..fdc40c1628460f7d4f745a9d332629f462c5d266 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -461,11 +461,11 @@ Tab::Tab(TabController* controller)
close_button_ = new TabCloseButton(this);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
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_->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
// Disable animation so that the red danger sign shows up immediately
@@ -1090,8 +1090,8 @@ void Tab::PaintTab(gfx::Canvas* canvas) {
close_button_color_ = title_color;
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
close_button_->SetBackground(close_button_color_,
- rb.GetImageSkiaNamed(IDR_TAB_CLOSE),
- rb.GetImageSkiaNamed(IDR_TAB_CLOSE_MASK));
+ rb.GetImageSkiaNamed(IDR_CLOSE_1),
+ rb.GetImageSkiaNamed(IDR_CLOSE_1_MASK));
}
}

Powered by Google App Engine
This is Rietveld 408576698