| Index: chrome/browser/ui/gtk/theme_service_gtk.h
|
| diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/theme_service_gtk.h
|
| similarity index 93%
|
| rename from chrome/browser/ui/gtk/gtk_theme_service.h
|
| rename to chrome/browser/ui/gtk/theme_service_gtk.h
|
| index 2d1f34a2ab477ea668b6c9ced8d3f509a63270dc..47f0818fe6770f06cf4a12acd91e65fc85591b43 100644
|
| --- a/chrome/browser/ui/gtk/gtk_theme_service.h
|
| +++ b/chrome/browser/ui/gtk/theme_service_gtk.h
|
| @@ -1,9 +1,9 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// 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_GTK_THEME_SERVICE_H_
|
| -#define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
|
| +#ifndef CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
|
| +#define CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
|
| #pragma once
|
|
|
| #include <map>
|
| @@ -37,7 +37,7 @@ typedef struct _GtkStyle GtkStyle;
|
| typedef struct _GtkWidget GtkWidget;
|
|
|
| // Specialization of ThemeService which supplies system colors.
|
| -class GtkThemeService : public ThemeService {
|
| +class ThemeServiceGtk : public ThemeService {
|
| public:
|
| // A list of integer keys for a separate PerDisplaySurfaceMap that keeps
|
| // what would otherwise be static icons on the X11 server.
|
| @@ -48,11 +48,11 @@ class GtkThemeService : public ThemeService {
|
| CHROME_FOLDER
|
| };
|
|
|
| - // Returns GtkThemeService, casted from our superclass.
|
| - static GtkThemeService* GetFrom(Profile* profile);
|
| + // Returns ThemeServiceGtk, casted from our superclass.
|
| + static ThemeServiceGtk* GetFrom(Profile* profile);
|
|
|
| - GtkThemeService();
|
| - virtual ~GtkThemeService();
|
| + ThemeServiceGtk();
|
| + virtual ~ThemeServiceGtk();
|
|
|
| // Calls |observer|.Observe() for the browser theme with this provider as the
|
| // source.
|
| @@ -225,15 +225,15 @@ class GtkThemeService : public ThemeService {
|
| void GetSelectedEntryForegroundHSL(color_utils::HSL* tint) const;
|
|
|
| // Handles signal from GTK that our theme has been changed.
|
| - CHROMEGTK_CALLBACK_1(GtkThemeService, void, OnStyleSet, GtkStyle*);
|
| + CHROMEGTK_CALLBACK_1(ThemeServiceGtk, void, OnStyleSet, GtkStyle*);
|
|
|
| // A notification from various GObject destructors that we should
|
| // remove it from our internal list.
|
| - CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyChromeButton);
|
| - CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyChromeLinkButton);
|
| - CHROMEGTK_CALLBACK_0(GtkThemeService, void, OnDestroyLabel);
|
| + CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyChromeButton);
|
| + CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyChromeLinkButton);
|
| + CHROMEGTK_CALLBACK_0(ThemeServiceGtk, void, OnDestroyLabel);
|
|
|
| - CHROMEGTK_CALLBACK_1(GtkThemeService, gboolean, OnSeparatorExpose,
|
| + CHROMEGTK_CALLBACK_1(ThemeServiceGtk, gboolean, OnSeparatorExpose,
|
| GdkEventExpose*);
|
|
|
| // Whether we should be using gtk rendering.
|
| @@ -301,4 +301,4 @@ class GtkThemeService : public ThemeService {
|
| static gfx::Image* default_bookmark_icon_;
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
|
| +#endif // CHROME_BROWSER_UI_GTK_THEME_SERVICE_GTK_H_
|
|
|