| Index: chrome/browser/ui/gtk/custom_button.h
|
| diff --git a/chrome/browser/ui/gtk/custom_button.h b/chrome/browser/ui/gtk/custom_button.h
|
| index 8cfa0d05e4bb9f61528f83dc0f8e8c3cf66882e6..4f93262e463fa3f72d4cbf537f3f7d44ac178dc9 100644
|
| --- a/chrome/browser/ui/gtk/custom_button.h
|
| +++ b/chrome/browser/ui/gtk/custom_button.h
|
| @@ -19,7 +19,7 @@
|
| #include "ui/base/gtk/owned_widget_gtk.h"
|
| #include "ui/gfx/rect.h"
|
|
|
| -class GtkThemeService;
|
| +class ThemeServiceGtk;
|
| class SkBitmap;
|
|
|
| namespace gfx {
|
| @@ -36,7 +36,7 @@ class CustomDrawButtonBase : public content::NotificationObserver {
|
| public:
|
| // If the images come from ResourceBundle rather than the theme provider,
|
| // pass in NULL for |theme_provider|.
|
| - CustomDrawButtonBase(GtkThemeService* theme_provider,
|
| + CustomDrawButtonBase(ThemeServiceGtk* theme_provider,
|
| int normal_id,
|
| int pressed_id,
|
| int hover_id,
|
| @@ -85,7 +85,7 @@ class CustomDrawButtonBase : public content::NotificationObserver {
|
| int pressed_id_;
|
| int hover_id_;
|
| int disabled_id_;
|
| - GtkThemeService* theme_service_;
|
| + ThemeServiceGtk* theme_service_;
|
|
|
| // Whether the button is flipped horizontally. Not used for RTL (we get
|
| // flipped versions from the theme provider). Used for the flipped window
|
| @@ -141,7 +141,7 @@ class CustomDrawButton : public content::NotificationObserver {
|
|
|
| // Same as above, but uses themed (and possibly tinted) images. |stock_id| and
|
| // |stock_size| are used for GTK+ theme mode.
|
| - CustomDrawButton(GtkThemeService* theme_provider,
|
| + CustomDrawButton(ThemeServiceGtk* theme_provider,
|
| int normal_id,
|
| int pressed_id,
|
| int hover_id,
|
| @@ -151,7 +151,7 @@ class CustomDrawButton : public content::NotificationObserver {
|
|
|
| // As above, but uses an arbitrary GtkImage rather than a stock icon. This
|
| // constructor takes ownership of |native_widget|.
|
| - CustomDrawButton(GtkThemeService* theme_provider,
|
| + CustomDrawButton(ThemeServiceGtk* theme_provider,
|
| int normal_id,
|
| int pressed_id,
|
| int hover_id,
|
| @@ -196,7 +196,7 @@ class CustomDrawButton : public content::NotificationObserver {
|
|
|
| // Returns a standard close button. Pass a |theme_provider| to use Gtk icons
|
| // in Gtk rendering mode.
|
| - static CustomDrawButton* CloseButton(GtkThemeService* theme_provider);
|
| + static CustomDrawButton* CloseButton(ThemeServiceGtk* theme_provider);
|
|
|
| private:
|
| // Sets the button to themed or not.
|
| @@ -221,7 +221,7 @@ class CustomDrawButton : public content::NotificationObserver {
|
| ui::OwnedWidgetGtk native_widget_;
|
|
|
| // Our theme provider.
|
| - GtkThemeService* theme_service_;
|
| + ThemeServiceGtk* theme_service_;
|
|
|
| // True if we should never do gtk rendering.
|
| bool forcing_chrome_theme_;
|
|
|