Use PrefChangeRegistrar everywhere

chrome/browser/dom_ui/core_options_handler.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/dom_ui/core_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 70 matching lines @@
   for (PreferenceCallbackMap::const_iterator iter = pref_callback_map_.begin();
        iter != pref_callback_map_.end();
        ++iter) {
     if (last_pref != iter->first) {
       StopObservingPref(iter->first);
       last_pref = iter->first;
     }
   }
 }
 
+DOMMessageHandler* CoreOptionsHandler::Attach(DOMUI* dom_ui) {
+  DOMMessageHandler* result = DOMMessageHandler::Attach(dom_ui);
+  DCHECK(dom_ui_);
+  registrar_.Init(dom_ui_->GetProfile()->GetPrefs());
+  return result;
+}
+
 void CoreOptionsHandler::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (type == NotificationType::PREF_CHANGED)
     NotifyPrefChanged(Details<std::string>(details).ptr());
 }
 
 void CoreOptionsHandler::RegisterMessages() {
   dom_ui_->RegisterMessageCallback("coreOptionsInitialize",
       NewCallback(this, &CoreOptionsHandler::HandleInitialize));
@@ skipping 30 matching lines @@
     dict->Set("value", pref->GetValue()->DeepCopy());
     dict->SetBoolean("managed", pref->IsManaged());
     return_value = dict;
   } else {
     return_value = Value::CreateNullValue();
   }
   return return_value;
 }
 
 void CoreOptionsHandler::ObservePref(const std::string& pref_name) {
-  DCHECK(dom_ui_);
-  PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
-  pref_service->AddPrefObserver(pref_name.c_str(), this);
+  registrar_.Add(pref_name.c_str(), this);
 }
 
 void CoreOptionsHandler::SetPref(const std::string& pref_name,
                                  Value::ValueType pref_type,
                                  const std::string& value_string,
                                  const std::string& metric) {
   DCHECK(dom_ui_);
   PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
 
   switch (pref_type) {
@@ skipping 24 matching lines @@
     return;
 
   std::string metric_string = metric;
   if (pref_type == Value::TYPE_BOOLEAN)
     metric_string += (value_string == "true" ? "_Enable" : "_Disable");
 
   UserMetricsRecordAction(UserMetricsAction(metric_string.c_str()));
 }
 
 void CoreOptionsHandler::StopObservingPref(const std::string& path) {
-  DCHECK(dom_ui_);
-  PrefService* pref_service = dom_ui_->GetProfile()->GetPrefs();
-  pref_service->RemovePrefObserver(path.c_str(), this);
+  registrar_.Remove(path.c_str(), this);
 }
 
 void CoreOptionsHandler::HandleFetchPrefs(const ListValue* args) {
   // First param is name of callback function, so, there needs to be at least
   // one more element for the actual preference identifier.
   const size_t kMinFetchPrefsParamCount = 2;
   if (args->GetSize() < kMinFetchPrefsParamCount)
     return;
 
   // Get callback JS function name.
@@ skipping 118 matching lines @@
       DictionaryValue* dict = new DictionaryValue;
       dict->Set("value", pref->GetValue()->DeepCopy());
       dict->SetBoolean("managed", pref->IsManaged());
       result_value.Append(dict);
 
       dom_ui_->CallJavascriptFunction(callback_function, result_value);
     }
   }
 }