Revert r123782.

chrome/browser/ui/gtk/avatar_menu_item_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/avatar_menu_item_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.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 "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
@@ skipping 15 matching lines @@
 const GdkColor kHighlightColor = GDK_COLOR_RGB(0xe3, 0xed, 0xf6);
 
 // The color of the background when we're in chrome-theme mode.
 const GdkColor kBackgroundColor = GDK_COLOR_RGB(0xff, 0xff, 0xff);
 
 }  // namespace
 
 AvatarMenuItemGtk::AvatarMenuItemGtk(Delegate* delegate,
                                      const AvatarMenuModel::Item& item,
                                      size_t item_index,
-                                     ThemeServiceGtk* theme_service)
+                                     GtkThemeService* theme_service)
     : delegate_(delegate),
       item_(item),
       item_index_(item_index),
       theme_service_(theme_service),
       status_label_(NULL),
       link_alignment_(NULL),
       edit_profile_link_(NULL) {
   Init(theme_service_);
 
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
@@ skipping 115 matching lines @@
                     gtk_widget_get_window(widget),
                     gtk_widget_get_state(widget),
                     &event->area, widget, NULL,
                     0, 0,
                     allocation.width, allocation.height);
   }
 
   return TRUE;
 }
 
-void AvatarMenuItemGtk::Init(ThemeServiceGtk* theme_service) {
+void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
   widget_.Own(gtk_event_box_new());
 
   g_signal_connect(widget_.get(), "button-press-event",
       G_CALLBACK(OnProfileClickThunk), this);
   g_signal_connect(widget_.get(), "enter-notify-event",
       G_CALLBACK(OnProfileEnterThunk), this);
   g_signal_connect(widget_.get(), "leave-notify-event",
       G_CALLBACK(OnProfileLeaveThunk), this);
   g_signal_connect(widget_.get(), "focus-in-event",
       G_CALLBACK(OnProfileFocusInThunk), this);
@@ skipping 84 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }