Revert r123782.

chrome/browser/ui/gtk/gtk_theme_service.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.
 
-#ifndef CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
-#define CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
+#ifndef CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
+#define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "content/public/browser/notification_observer.h"
@@ skipping 13 matching lines @@
 }
 
 typedef struct _GdkDisplay GdkDisplay;
 typedef struct _GdkEventExpose GdkEventExpose;
 typedef struct _GdkPixbuf GdkPixbuf;
 typedef struct _GtkIconSet GtkIconSet;
 typedef struct _GtkStyle GtkStyle;
 typedef struct _GtkWidget GtkWidget;
 
 // Specialization of ThemeService which supplies system colors.
-class ThemeServiceGtk : public ThemeService {
+class GtkThemeService : public ThemeService {
  public:
   // A list of integer keys for a separate PerDisplaySurfaceMap that keeps
   // what would otherwise be static icons on the X11 server.
   enum CairoDefaultIcon {
     NATIVE_FAVICON = 1,
     CHROME_FAVICON,
     NATIVE_FOLDER,
     CHROME_FOLDER
   };
 
-  // Returns ThemeServiceGtk, casted from our superclass.
-  static ThemeServiceGtk* GetFrom(Profile* profile);
+  // Returns GtkThemeService, casted from our superclass.
+  static GtkThemeService* GetFrom(Profile* profile);
 
-  ThemeServiceGtk();
-  virtual ~ThemeServiceGtk();
+  GtkThemeService();
+  virtual ~GtkThemeService();
 
   // Calls |observer|.Observe() for the browser theme with this provider as the
   // source.
   void InitThemesFor(content::NotificationObserver* observer);
 
   // Overridden from ThemeService:
   //
   // Sets that we aren't using the system theme, then calls
   // ThemeService's implementation.
   virtual void Init(Profile* profile) OVERRIDE;
@@ skipping 150 matching lines @@
   void GetNormalButtonTintHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current normal text in an entry.
   void GetNormalEntryForegroundHSL(color_utils::HSL* tint) const;
 
   // Returns a tint that's the color of the current highlighted text in an
   // entry.
   void GetSelectedEntryForegroundHSL(color_utils::HSL* tint) const;
 
   // Handles signal from GTK that our theme has been changed.
-  CHROMEGTK_CALLBACK_1(ThemeServiceGtk, void, OnStyleSet, GtkStyle*);
+  CHROMEGTK_CALLBACK_1(GtkThemeService, void, OnStyleSet, GtkStyle*);
 
   // A notification from various GObject destructors that we should
   // remove it from our internal list.
-  CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyChromeButton);
-  CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyChromeLinkButton);
-  CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyLabel);
+  CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyChromeButton);
+  CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyChromeLinkButton);
+  CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyLabel);
 
-  CHROMEGTK_CALLBACK_1(ThemeServiceGtk, gboolean, OnSeparatorExpose,
+  CHROMEGTK_CALLBACK_1(GtkThemeService, gboolean, OnSeparatorExpose,
                        GdkEventExpose*);
 
   // Whether we should be using gtk rendering.
   bool use_gtk_;
 
   // GtkWidgets that exist only so we can look at their properties (and take
   // their colors).
   GtkWidget* fake_window_;
   GtkWidget* fake_frame_;
   ui::OwnedWidgetGtk fake_label_;
@@ skipping 47 matching lines @@
   static GtkWidget* icon_widget_;
 
   // The default folder icon and default bookmark icon for the GTK theme.
   // These are static because the system can only have one theme at a time.
   // They are cached when they are requested the first time, and cleared when
   // the system theme changes.
   static gfx::Image* default_folder_icon_;
   static gfx::Image* default_bookmark_icon_;
 };
 
-#endif  // CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
+#endif  // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_