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

Unified Diff: chrome/browser/ui/gtk/custom_button.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
« no previous file with comments | « chrome/browser/ui/gtk/custom_button.h ('k') | chrome/browser/ui/gtk/download/download_shelf_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/custom_button.cc
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc
index 2b41351df5ae1d617c7aef17e8281a382d0450c9..10ecab5f238f78c985452b8c5758ba39f30b1849 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/ui/gtk/gtk_util.h"
#include "chrome/common/chrome_notification_types.h"
#include "content/public/browser/notification_source.h"
+#include "grit/theme_resources.h"
#include "grit/ui_resources.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/resource/resource_bundle.h"
@@ -355,10 +356,20 @@ gboolean CustomDrawButton::OnCustomExpose(GtkWidget* sender,
}
// static
-CustomDrawButton* CustomDrawButton::CloseButton(
+CustomDrawButton* CustomDrawButton::CloseButtonBar(
GtkThemeService* theme_provider) {
- CustomDrawButton* button = new CustomDrawButton(theme_provider, IDR_CLOSE_BAR,
- IDR_CLOSE_BAR_P, IDR_CLOSE_BAR_H, 0, GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ CustomDrawButton* button = new CustomDrawButton(theme_provider,
+ IDR_CLOSE_1, IDR_CLOSE_1_P, IDR_CLOSE_1_H, 0,
+ GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ return button;
+}
+
+// static
+CustomDrawButton* CustomDrawButton::CloseButtonBubble(
+ GtkThemeService* theme_provider) {
+ CustomDrawButton* button = new CustomDrawButton(theme_provider,
+ IDR_CLOSE_2, IDR_CLOSE_2_P, IDR_CLOSE_2_H, 0,
+ GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
return button;
}
« no previous file with comments | « chrome/browser/ui/gtk/custom_button.h ('k') | chrome/browser/ui/gtk/download/download_shelf_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698