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

Unified Diff: chrome/browser/ui/gtk/find_bar_gtk.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/gtk/find_bar_gtk.cc
diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc
index 6e71775a9f186ab4f7bd78d434720fc3423fe557..ef3d70d62b20876221a19bd040b7459752578c73 100644
--- a/chrome/browser/ui/gtk/find_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/find_bar_gtk.cc
@@ -248,10 +248,7 @@ void FindBarGtk::InitWidgets() {
0, false, true, NULL));
GtkWidget* close_alignment = gtk_alignment_new(0, 0.6, 1, 0);
- close_button_.reset(new CustomDrawButton(
- theme_service_, IDR_TAB_CLOSE,
- IDR_TAB_CLOSE_P, IDR_TAB_CLOSE_H, IDR_TAB_CLOSE,
- GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU));
+ close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
gtk_container_add(GTK_CONTAINER(close_alignment), close_button_->widget());
gtk_box_pack_end(GTK_BOX(hbox), close_alignment, FALSE, FALSE,
kCloseButtonPadding);
@@ -561,8 +558,8 @@ void FindBarGtk::Observe(int type,
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
close_button_->SetBackground(
theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT),
- rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap(),
- rb.GetImageNamed(IDR_TAB_CLOSE).AsBitmap());
+ rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+ rb.GetImageNamed(IDR_CLOSE_1).AsBitmap());
}
UpdateMatchLabelAppearance(match_label_failure_);
« no previous file with comments | « chrome/browser/ui/gtk/extensions/extension_installed_bubble_gtk.cc ('k') | chrome/browser/ui/gtk/infobars/infobar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698