Remove content::NotificationObserver dependency from most Prefs code.

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_GTK_THEME_SERVICE_H_
 #define CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_
 
 #include <map>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #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 "content/public/browser/notification_observer.h"
 #include "ui/base/glib/glib_integers.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/base/gtk/owned_widget_gtk.h"
 #include "ui/gfx/color_utils.h"
 
 class Profile;
 
 namespace extensions {
 class Extension;
 }
 
 namespace gfx {
 class CairoCachedSurface;
 }
 
 namespace ui {
 class GtkSignalRegistrar;
 }
 
 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 GtkThemeService : public ThemeService {
+class GtkThemeService : public ThemeService, public PrefObserver {
  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
   };
 
@@ skipping 15 matching lines @@
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
   virtual gfx::Image GetImageNamed(int id) const OVERRIDE;
   virtual SkColor GetColor(int id) const OVERRIDE;
   virtual bool HasCustomImage(int id) const OVERRIDE;
   virtual void SetTheme(const extensions::Extension* extension) OVERRIDE;
   virtual void UseDefaultTheme() OVERRIDE;
   virtual void SetNativeTheme() OVERRIDE;
   virtual bool UsingDefaultTheme() const OVERRIDE;
   virtual bool UsingNativeTheme() const OVERRIDE;
 
-  // Overridden from ThemeService, content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) 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.
   GtkWidget* BuildChromeButton();
 
   // Creates a GtkChromeLinkButton instance. We update its state as theme
   // changes, and listen for its destruction.
   GtkWidget* BuildChromeLinkButton(const std::string& text);
 
@@ skipping 211 matching lines @@
 
   // 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 base::LazyInstance<gfx::Image> default_folder_icon_;
   static base::LazyInstance<gfx::Image> default_bookmark_icon_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_GTK_THEME_SERVICE_H_