Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/startup_pages_handler.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_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "ui/base/models/table_model_observer.h"
 
 class AutocompleteController;
 class CustomHomePagesTableModel;
 class TemplateURLService;
 
 namespace options {
 
 // Chrome browser options page UI handler.
 class StartupPagesHandler : public OptionsPageUIHandler,
                             public AutocompleteControllerDelegate,
+                            public PrefObserver,
                             public ui::TableModelObserver {
  public:
   StartupPagesHandler();
   virtual ~StartupPagesHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializeHandler() OVERRIDE;
   virtual void InitializePage() OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
 
   // AutocompleteControllerDelegate implementation.
   virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
 
   // ui::TableModelObserver implementation.
   virtual void OnModelChanged() OVERRIDE;
   virtual void OnItemsChanged(int start, int length) OVERRIDE;
   virtual void OnItemsAdded(int start, int length) OVERRIDE;
   virtual void OnItemsRemoved(int start, int length) OVERRIDE;
 
  private:
-  // content::NotificationObserver implementation.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver implementation.
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
   // Saves the changes that have been made. Called from WebUI.
   void CommitChanges(const ListValue* args);
 
   // Cancels the changes that have been made. Called from WebUI.
   void CancelChanges(const ListValue* args);
 
   // Removes the startup page at the given indexes. Called from WebUI.
   void RemoveStartupPages(const ListValue* args);
 
@@ skipping 31 matching lines @@
   // CustomHomePagesTableModel, consider changing it to something more like
   // TemplateURLService.
   scoped_ptr<CustomHomePagesTableModel> startup_custom_pages_table_model_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupPagesHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_STARTUP_PAGES_HANDLER_H_