Revert r123782.

chrome/browser/ui/gtk/web_intent_picker_gtk.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/web_intent_picker_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/gtk/browser_toolbar_gtk.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/location_bar_view_gtk.h"
 #include "chrome/browser/ui/gtk/tab_contents_container_gtk.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/browser/ui/gtk/throbber_gtk.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
@@ skipping 28 matching lines @@
 const int kTitleLinkMaxWidth = 130;
 
 // Indices of the extension row widgets.
 enum {
   kIconIndex,
   kTitleLinkIndex,
   kStarsIndex,
   kInstallButtonIndex,
 };
 
-ThemeServiceGtk *GetThemeService(TabContentsWrapper* wrapper) {
-  return ThemeServiceGtk::GetFrom(wrapper->profile());
+GtkThemeService *GetThemeService(TabContentsWrapper* wrapper) {
+  return GtkThemeService::GetFrom(wrapper->profile());
 }
 
 // Set the image of |button| to |pixbuf|.
 void SetServiceButtonImage(GtkWidget* button, GdkPixbuf* pixbuf) {
   gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_pixbuf(pixbuf));
   gtk_button_set_image_position(GTK_BUTTON(button), GTK_POS_LEFT);
 }
 
 void SetWidgetFontSizeCallback(GtkWidget* widget, gpointer data) {
   if (GTK_IS_LABEL(widget)) {
@@ skipping 73 matching lines @@
       extensions_vbox_(NULL),
       window_(NULL) {
   DCHECK(delegate_ != NULL);
 
   model_->set_observer(this);
   InitContents();
   UpdateInstalledServices();
   UpdateCWSLabel();
   UpdateSuggestedExtensions();
 
-  ThemeServiceGtk* theme_service = GetThemeService(wrapper);
+  GtkThemeService* theme_service = GetThemeService(wrapper);
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                        content::Source<ThemeService>(theme_service));
   theme_service->InitThemesFor(this);
 
   window_ = new ConstrainedWindowGtk(wrapper, this);
 }
 
 WebIntentPickerGtk::~WebIntentPickerGtk() {
 }
 
@@ skipping 115 matching lines @@
 }
 
 bool WebIntentPickerGtk::ShouldHaveBorderPadding() const {
   return false;
 }
 
 void WebIntentPickerGtk::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
-  ThemeServiceGtk* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(wrapper_);
   if (theme_service->UsingNativeTheme())
     gtk_util::UndoForceFontSize(header_label_);
   else
     gtk_util::ForceFontSizePixels(header_label_, kHeaderLabelPixelSize);
 
   UpdateInstalledServices();
   UpdateSuggestedExtensions();
 }
 
 void WebIntentPickerGtk::OnDestroy(GtkWidget* button) {
@@ skipping 58 matching lines @@
   g_list_free(button_list);
 
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
 
   delegate_->OnServiceChosen(installed_service.url,
                              installed_service.disposition);
 }
 
 void WebIntentPickerGtk::InitContents() {
-  ThemeServiceGtk* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(wrapper_);
 
   // Main contents vbox.
   contents_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_set_size_request(contents_, kMainContentWidth, -1);
 
   // Hbox containing the close button.
   GtkWidget* close_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(contents_), close_hbox, TRUE, TRUE, 0);
 
   close_button_.reset(
@@ skipping 123 matching lines @@
     gtk_widget_show(gtk_widget_get_parent(button_vbox_));
   }
 
   if (model_->GetSuggestedExtensionCount() == 0)
     gtk_widget_hide(cws_label_);
   else
     gtk_widget_show(cws_label_);
 }
 
 void WebIntentPickerGtk::UpdateSuggestedExtensions() {
-  ThemeServiceGtk* theme_service = GetThemeService(wrapper_);
+  GtkThemeService* theme_service = GetThemeService(wrapper_);
 
   gtk_util::RemoveAllChildren(extensions_vbox_);
 
   if (model_->GetSuggestedExtensionCount() == 0) {
     gtk_widget_hide(gtk_widget_get_parent(extensions_vbox_));
     return;
   }
 
   gtk_widget_show(gtk_widget_get_parent(extensions_vbox_));
 
@@ skipping 63 matching lines @@
   return alignment;
 }
 
 void WebIntentPickerGtk::RemoveThrobber() {
   GtkWidget* alignment = gtk_widget_get_parent(throbber_->widget());
   DCHECK(alignment);
   gtk_container_remove(GTK_CONTAINER(alignment), throbber_->widget());
   gtk_widget_destroy(alignment);
   throbber_->Stop();
 }