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

Unified Diff: chrome/browser/ui/gtk/download/download_shelf_gtk.cc

Issue 12703039: Inconsistent use of [x] close panel icon. Code changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added recently added local NTP file. 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/download/download_shelf_gtk.cc
diff --git a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
index d5a2aa569292af47f581844d32ef903f6594a9d2..d1badeab6956a9eea17d0e516976e08c6e0eeddf 100644
--- a/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_shelf_gtk.cc
@@ -120,7 +120,7 @@ DownloadShelfGtk::DownloadShelfGtk(Browser* browser, GtkWidget* parent)
gtk_container_add(GTK_CONTAINER(shelf_.get()), vbox);
// Create and pack the close button.
- close_button_.reset(CustomDrawButton::CloseButton(theme_service_));
+ close_button_.reset(CustomDrawButton::CloseButtonBar(theme_service_));
gtk_util::CenterWidgetInHBox(outer_hbox, close_button_->widget(), true, 0);
g_signal_connect(close_button_->widget(), "clicked",
G_CALLBACK(OnButtonClickThunk), this);
@@ -268,8 +268,8 @@ void DownloadShelfGtk::Observe(int type,
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
close_button_->SetBackground(
theme_service_->GetColor(ThemeProperties::COLOR_TAB_TEXT),
- rb.GetImageNamed(IDR_CLOSE_BAR).AsBitmap(),
- rb.GetImageNamed(IDR_CLOSE_BAR_MASK).AsBitmap());
+ rb.GetImageNamed(IDR_CLOSE_1).AsBitmap(),
+ rb.GetImageNamed(IDR_CLOSE_1_MASK).AsBitmap());
}
}
« no previous file with comments | « chrome/browser/ui/gtk/custom_button.cc ('k') | chrome/browser/ui/gtk/extensions/bundle_installed_bubble_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698