diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 16:40:43 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 16:40:43 +0000 |
| commit | 8046ead829b2c82f619032692bee10ac6aa55171 (patch) | |
| tree | d229d61fd441366ab755a3a9faaf52aa8a1f1300 /chrome/browser/ui/gtk/gtk_theme_service.h | |
| parent | 92ba1bd800e2dedb603e267d3e76b4a0675c6f63 (diff) | |
| download | chromium_src-8046ead829b2c82f619032692bee10ac6aa55171.zip chromium_src-8046ead829b2c82f619032692bee10ac6aa55171.tar.gz chromium_src-8046ead829b2c82f619032692bee10ac6aa55171.tar.bz2 | |
gtk: Remove PrefObserver usages, batch 8.
BUG=155525
R=mnissler@chromium.org
TBR=erg@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11417071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/gtk_theme_service.h')
| -rw-r--r-- | chrome/browser/ui/gtk/gtk_theme_service.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/ui/gtk/gtk_theme_service.h b/chrome/browser/ui/gtk/gtk_theme_service.h index 1d4f147..b476767 100644 --- a/chrome/browser/ui/gtk/gtk_theme_service.h +++ b/chrome/browser/ui/gtk/gtk_theme_service.h @@ -12,7 +12,6 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/prefs/public/pref_change_registrar.h" -#include "base/prefs/public/pref_observer.h" #include "chrome/browser/themes/theme_service.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/gtk/gtk_signal.h" @@ -41,7 +40,7 @@ typedef struct _GtkStyle GtkStyle; typedef struct _GtkWidget GtkWidget; // Specialization of ThemeService which supplies system colors. -class GtkThemeService : public ThemeService, public PrefObserver { +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. @@ -77,10 +76,6 @@ class GtkThemeService : public ThemeService, public PrefObserver { virtual bool UsingDefaultTheme() const OVERRIDE; virtual bool UsingNativeTheme() const OVERRIDE; - // Overridden from PrefObserver: - virtual void OnPreferenceChanged(PrefServiceBase* service, - const std::string& pref_name) OVERRIDE; - // Creates a GtkChromeButton instance, registered with this theme provider, // with a "destroy" signal to remove it from our internal list when it goes // away. @@ -243,6 +238,8 @@ class GtkThemeService : public ThemeService, public PrefObserver { CHROMEGTK_CALLBACK_1(GtkThemeService, gboolean, OnSeparatorExpose, GdkEventExpose*); + void OnUsesSystemThemeChanged(); + // Whether we should be using gtk rendering. bool use_gtk_; |