Revert r123782.

chrome/browser/ui/gtk/custom_button.cc

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 65e36940857b00d7fee682b514ecd04207e93ebd..92167d399a3083bb91f27292c70ef1b5f6af6fd3 100644
--- a/chrome/browser/ui/gtk/custom_button.cc
+++ b/chrome/browser/ui/gtk/custom_button.cc
@@ -8,8 +8,8 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/ui_resources_standard.h"
@@ -31,7 +31,7 @@ GdkPixbuf* GetImage(int resource_id) {
 
 }  // namespace
 
-CustomDrawButtonBase::CustomDrawButtonBase(ThemeServiceGtk* theme_provider,
+CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,
                                            int normal_id,
                                            int pressed_id,
                                            int hover_id,
@@ -244,7 +244,7 @@ CustomDrawButton::CustomDrawButton(int normal_id,
   SetBrowserTheme();
 }
 
-CustomDrawButton::CustomDrawButton(ThemeServiceGtk* theme_provider,
+CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
@@ -265,7 +265,7 @@ CustomDrawButton::CustomDrawButton(ThemeServiceGtk* theme_provider,
                  content::Source<ThemeService>(theme_provider));
 }
 
-CustomDrawButton::CustomDrawButton(ThemeServiceGtk* theme_provider,
+CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
@@ -354,7 +354,7 @@ gboolean CustomDrawButton::OnCustomExpose(GtkWidget* sender,
 
 // static
 CustomDrawButton* CustomDrawButton::CloseButton(
-    ThemeServiceGtk* theme_provider) {
+    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);
   return button;