Revert r123782.

chrome/browser/ui/gtk/browser_titlebar.h

 // 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.
 //
 // A helper class that contains the gtk widgets that make up the titlebar.  The
 // titlebar consists of the tabstrip and if the custom chrome frame is turned
 // on, it includes the taller titlebar and minimize, restore, maximize, and
 // close buttons.
 
 #ifndef CHROME_BROWSER_UI_GTK_BROWSER_TITLEBAR_H_
 #define CHROME_BROWSER_UI_GTK_BROWSER_TITLEBAR_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/x/active_window_watcher_x_observer.h"
 
 class AvatarMenuButtonGtk;
 class BrowserWindowGtk;
 class CustomDrawButton;
-class ThemeServiceGtk;
+class GtkThemeService;
 class MenuGtk;
 class PopupPageMenuModel;
 
 namespace content {
 class WebContents;
 }
 
 class BrowserTitlebar : public content::NotificationObserver,
                         public ui::ActiveWindowWatcherXObserver,
                         public ui::SimpleMenuModel::Delegate {
@@ skipping 81 matching lines @@
   // is allocated (though the user can (and do) manually mess with their gconf
   // settings to get absolutely horrid combinations of buttons on both sides.
   GtkWidget* GetButtonHBox(bool left_side);
 
   CustomDrawButton* minimize_button() const { return minimize_button_.get(); }
   CustomDrawButton* maximize_button() const { return maximize_button_.get(); }
   CustomDrawButton* restore_button() const { return restore_button_.get(); }
   CustomDrawButton* close_button() const { return close_button_.get(); }
   GtkWidget* app_mode_title() const { return app_mode_title_; }
 
-  ThemeServiceGtk* theme_service() const { return theme_service_; }
+  GtkThemeService* theme_service() const { return theme_service_; }
 
  private:
   // A helper class to keep track of which frame of the throbber animation
   // we're showing.
   class Throbber {
    public:
     Throbber() : current_frame_(0), current_waiting_frame_(0) {}
 
     // Get the next frame in the animation. The image is owned by the throbber
     // so the caller doesn't need to unref.  |is_waiting| is true if we're
@@ skipping 145 matching lines @@
   scoped_ptr<MenuGtk> favicon_menu_;
   scoped_ptr<PopupPageMenuModel> favicon_menu_model_;
 
   // The throbber used when the window is in app mode or popup window mode.
   Throbber throbber_;
 
   // The avatar button.
   scoped_ptr<AvatarMenuButtonGtk> avatar_button_;
 
   // Theme provider for building buttons.
-  ThemeServiceGtk* theme_service_;
+  GtkThemeService* theme_service_;
 
   content::NotificationRegistrar registrar_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_BROWSER_TITLEBAR_H_