Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/views/toolbar_view.h

Index: chrome/browser/ui/views/toolbar_view.h
diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h
index bf1419236a1a5c79900360431f7071f8d812f714..7bf5285a74e8136d16fcaafe6d81ce0052c39116 100644
--- a/chrome/browser/ui/views/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar_view.h
@@ -10,6 +10,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/command_observer.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
@@ -47,7 +48,8 @@ class ToolbarView : public views::AccessiblePaneView,
                     public chrome::search::SearchModelObserver,
                     public content::NotificationObserver,
                     public CommandObserver,
-                    public views::ButtonListener {
+                    public views::ButtonListener,
+                    public PrefObserver {
  public:
   // The view class name.
   static const char kViewClassName[];
@@ -142,6 +144,10 @@ class ToolbarView : public views::AccessiblePaneView,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Overridden from PrefObserver:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // Overridden from ui::AcceleratorProvider:
   virtual bool GetAcceleratorForCommandId(
       int command_id, ui::Accelerator* accelerator) OVERRIDE;