Use PrefChangeRegistrar everywhere

chrome/browser/views/options/general_page_view.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/views/options/general_page_view.h"
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ skipping 199 matching lines @@
       default_browser_group_(NULL),
       default_browser_status_label_(NULL),
       default_browser_use_as_default_button_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           default_browser_worker_(
               new ShellIntegration::DefaultBrowserWorker(this))),
       OptionsPageView(profile) {
 }
 
 GeneralPageView::~GeneralPageView() {
-  profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this);
-  profile()->GetPrefs()->RemovePrefObserver(
-      prefs::kURLsToRestoreOnStartup, this);
   if (startup_custom_pages_table_)
     startup_custom_pages_table_->SetModel(NULL);
   default_browser_worker_->ObserverDestroyed();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, views::ButtonListener implementation:
 
 void GeneralPageView::ButtonPressed(
     views::Button* sender, const views::Event& event) {
@@ skipping 116 matching lines @@
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
 #if !defined(OS_CHROMEOS)
   layout->StartRow(0, single_column_view_set_id);
   InitDefaultBrowserGroup();
   layout->AddView(default_browser_group_);
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 #endif
 
   // Register pref observers that update the controls when a pref changes.
-  profile()->GetPrefs()->AddPrefObserver(prefs::kRestoreOnStartup, this);
-  profile()->GetPrefs()->AddPrefObserver(prefs::kURLsToRestoreOnStartup, this);
+  registrar_.Init(profile()->GetPrefs());
+  registrar_.Add(prefs::kRestoreOnStartup, this);
+  registrar_.Add(prefs::kURLsToRestoreOnStartup, this);
 
   new_tab_page_is_home_page_.Init(prefs::kHomePageIsNewTabPage,
       profile()->GetPrefs(), this);
   homepage_.Init(prefs::kHomePage, profile()->GetPrefs(), this);
   show_home_button_.Init(prefs::kShowHomeButton, profile()->GetPrefs(), this);
 }
 
 void GeneralPageView::NotifyPrefChanged(const std::string* pref_name) {
   if (!pref_name ||
       *pref_name == prefs::kRestoreOnStartup ||
@@ skipping 444 matching lines @@
   }
   homepage_use_url_textfield_->SetEnabled(enabled);
   homepage_use_url_textfield_->SetReadOnly(!enabled);
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->selected_item();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }