Use PrefChangeRegistrar everywhere

chrome/browser/gtk/options/general_page_gtk.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/gtk/options/general_page_gtk.h"
 
 #include <set>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 77 matching lines @@
       InitHomepageGroup(), false);
   options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTSEARCH_GROUP_NAME),
       InitDefaultSearchGroup(), false);
 #if !defined(OS_CHROMEOS)
   options_builder->AddOptionGroup(
       l10n_util::GetStringUTF8(IDS_OPTIONS_DEFAULTBROWSER_GROUP_NAME),
       InitDefaultBrowserGroup(), false);
 #endif
 
-  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);
 
   // Load initial values
   NotifyPrefChanged(NULL);
 }
 
 GeneralPageGtk::~GeneralPageGtk() {
-  profile()->GetPrefs()->RemovePrefObserver(prefs::kRestoreOnStartup, this);
-  profile()->GetPrefs()->RemovePrefObserver(
-      prefs::kURLsToRestoreOnStartup, this);
-
   if (template_url_model_)
     template_url_model_->RemoveObserver(this);
 
   default_browser_worker_->ObserverDestroyed();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageGtk, OptionsPageBase overrides:
 
 void GeneralPageGtk::NotifyPrefChanged(const std::string* pref_name) {
@@ skipping 589 matching lines @@
   if (color) {
     char* markup = g_markup_printf_escaped(kDefaultBrowserLabelMarkup,
                                            color, text.c_str());
     gtk_label_set_markup(GTK_LABEL(default_browser_status_label_), markup);
     g_free(markup);
   }
 
   gtk_widget_set_sensitive(default_browser_use_as_default_button_,
                            state == ShellIntegration::STATE_NOT_DEFAULT);
 }