Revert r123782.

chrome/browser/ui/gtk/custom_button.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/custom_button.h"
 
 #include "base/basictypes.h"
 #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"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/cairo_cached_surface.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 namespace {
 
 GdkPixbuf* GetImage(int resource_id) {
   if (!resource_id)
     return NULL;
   return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(
     resource_id, ui::ResourceBundle::RTL_ENABLED).ToGdkPixbuf();
 }
 
 }  // namespace
 
-CustomDrawButtonBase::CustomDrawButtonBase(ThemeServiceGtk* theme_provider,
+CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider,
                                            int normal_id,
                                            int pressed_id,
                                            int hover_id,
                                            int disabled_id)
     : background_image_(NULL),
       paint_override_(-1),
       normal_id_(normal_id),
       pressed_id_(pressed_id),
       hover_id_(hover_id),
       disabled_id_(disabled_id),
@@ skipping 192 matching lines @@
                                    int disabled_id)
     : button_base_(NULL, normal_id, pressed_id, hover_id, disabled_id),
       theme_service_(NULL),
       forcing_chrome_theme_(false) {
   Init();
 
   // Initialize the theme stuff with no theme_provider.
   SetBrowserTheme();
 }
 
-CustomDrawButton::CustomDrawButton(ThemeServiceGtk* theme_provider,
+CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
                                    const char* stock_id,
                                    GtkIconSize stock_size)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
       theme_service_(theme_provider),
       forcing_chrome_theme_(false) {
   native_widget_.Own(gtk_image_new_from_stock(stock_id, stock_size));
 
   Init();
 
   theme_service_->InitThemesFor(this);
   registrar_.Add(this,
                  chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(theme_provider));
 }
 
-CustomDrawButton::CustomDrawButton(ThemeServiceGtk* theme_provider,
+CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider,
                                    int normal_id,
                                    int pressed_id,
                                    int hover_id,
                                    int disabled_id,
                                    GtkWidget* native_widget)
     : button_base_(theme_provider, normal_id, pressed_id, hover_id,
                    disabled_id),
       native_widget_(native_widget),
       theme_service_(theme_provider),
       forcing_chrome_theme_(false) {
@@ skipping 68 matching lines @@
     // Continue processing this expose event.
     return FALSE;
   } else {
     double hover_state = hover_controller_.GetCurrentValue();
     return button_base_.OnExpose(sender, e, hover_state);
   }
 }
 
 // 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;
 }
 
 void CustomDrawButton::SetBrowserTheme() {
   if (UseGtkTheme()) {
     if (native_widget_.get())
       gtk_button_set_image(GTK_BUTTON(widget()), native_widget_.get());
     gtk_widget_set_size_request(widget(), -1, -1);
     gtk_widget_set_app_paintable(widget(), FALSE);
   } else {
     if (native_widget_.get())
       gtk_button_set_image(GTK_BUTTON(widget()), NULL);
     gtk_widget_set_size_request(widget(), button_base_.Width(),
                                 button_base_.Height());
 
     gtk_widget_set_app_paintable(widget(), TRUE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
   return !forcing_chrome_theme_ && theme_service_ &&
       theme_service_->UsingNativeTheme();
 }