Revert r123782.

chrome/browser/ui/gtk/confirm_bubble_view.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/confirm_bubble_view.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/confirm_bubble_model.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_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 "grit/theme_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 // Padding between content and edge of bubble.
 const int kContentBorder = 7;
@@ skipping 34 matching lines @@
 }
 
 void ConfirmBubbleView::BubbleClosing(BubbleGtk* bubble,
                                       bool closed_by_escape) {
 }
 
 void ConfirmBubbleView::Show() {
   GtkWidget* toplevel = gtk_widget_get_toplevel(anchor_);
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(GTK_WINDOW(toplevel));
-  ThemeServiceGtk* theme_service = ThemeServiceGtk::GetFrom(
+  GtkThemeService* theme_service = GtkThemeService::GetFrom(
       browser_window->browser()->profile());
 
   GtkWidget* content = gtk_vbox_new(FALSE, kInterLineSpacing);
   gtk_container_set_border_width(GTK_CONTAINER(content), kContentBorder);
   g_signal_connect(content, "destroy", G_CALLBACK(OnDestroyThunk), this);
 
   // Add the icon, the title label and the close button to the first row.
   GtkWidget* row = gtk_hbox_new(FALSE, kImageViewSpacing);
   GtkWidget* icon_view =
       gtk_image_new_from_pixbuf(model_->GetIcon()->ToGdkPixbuf());
@@ skipping 92 matching lines @@
   // click this button. We should ask the model if we can close this view.
   bubble_->Close();
 }
 
 void ConfirmBubbleView::OnLinkButton(GtkWidget* sender) {
   model_->LinkClicked();
   // TODO(hbono): this code prevents the model from updating this view when we
   // click this link. We should ask the model if we can close this view.
   bubble_->Close();
 }