Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/password_manager_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_PASSWORD_MANAGER_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/api/prefs/pref_member.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_consumer.h"
 #include "chrome/browser/ui/webui/options/options_ui.h"
 
 namespace content {
 struct PasswordForm;
 }
 
 namespace options {
 
 class PasswordManagerHandler : public OptionsPageUIHandler,
-                               public PasswordStore::Observer {
+                               public PasswordStore::Observer,
+                               public PrefObserver {
  public:
   PasswordManagerHandler();
   virtual ~PasswordManagerHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializeHandler() OVERRIDE;
   virtual void RegisterMessages() OVERRIDE;
 
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged() OVERRIDE;
 
-  // 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;
 
  private:
   // The password store associated with the currently active profile.
   PasswordStore* GetPasswordStore();
 
   // Called when the JS PasswordManager object is initialized.
   void UpdatePasswordLists(const ListValue* args);
 
   // Remove an entry.
   // @param value the entry index to be removed.
@@ skipping 77 matching lines @@
 
   // Whether to show stored passwords or not.
   BooleanPrefMember show_passwords_;
 
   DISALLOW_COPY_AND_ASSIGN(PasswordManagerHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_PASSWORD_MANAGER_HANDLER_H_