Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/font_settings_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/font_settings_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 169 matching lines @@
       sans_serif_font_.GetValue())));
   selected_values.Append(Value::CreateStringValue(MaybeGetLocalizedFontName(
       fixed_font_.GetValue())));
   selected_values.Append(Value::CreateStringValue(font_encoding_.GetValue()));
 
   web_ui()->CallJavascriptFunction("FontSettings.setFontsData",
                                    *list.get(), encoding_list,
                                    selected_values);
 }
 
-void FontSettingsHandler::Observe(int type,
-                                  const content::NotificationSource& source,
-                                  const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    std::string* pref_name = content::Details<std::string>(details).ptr();
-    if (*pref_name == prefs::kWebKitStandardFontFamily) {
-      SetUpStandardFontSample();
-    } else if (*pref_name == prefs::kWebKitSerifFontFamily) {
-      SetUpSerifFontSample();
-    } else if (*pref_name == prefs::kWebKitSansSerifFontFamily) {
-      SetUpSansSerifFontSample();
-    } else if (*pref_name == prefs::kWebKitFixedFontFamily ||
-               *pref_name == prefs::kWebKitDefaultFixedFontSize) {
-      SetUpFixedFontSample();
-    } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
-      SetUpStandardFontSample();
-      SetUpSerifFontSample();
-      SetUpSansSerifFontSample();
-    } else if (*pref_name == prefs::kWebKitMinimumFontSize) {
-      SetUpMinimumFontSample();
-    }
+void FontSettingsHandler::OnPreferenceChanged(PrefServiceBase* service,
+                                              const std::string& pref_name) {
+  if (pref_name == prefs::kWebKitStandardFontFamily) {
+    SetUpStandardFontSample();
+  } else if (pref_name == prefs::kWebKitSerifFontFamily) {
+    SetUpSerifFontSample();
+  } else if (pref_name == prefs::kWebKitSansSerifFontFamily) {
+    SetUpSansSerifFontSample();
+  } else if (pref_name == prefs::kWebKitFixedFontFamily ||
+             pref_name == prefs::kWebKitDefaultFixedFontSize) {
+    SetUpFixedFontSample();
+  } else if (pref_name == prefs::kWebKitDefaultFontSize) {
+    SetUpStandardFontSample();
+    SetUpSerifFontSample();
+    SetUpSansSerifFontSample();
+  } else if (pref_name == prefs::kWebKitMinimumFontSize) {
+    SetUpMinimumFontSample();
   }
 }
 
 void FontSettingsHandler::SetUpStandardFontSample() {
   base::StringValue font_value(standard_font_.GetValue());
   base::FundamentalValue size_value(default_font_size_.GetValue());
   web_ui()->CallJavascriptFunction(
       "FontSettings.setUpStandardFontSample", font_value, size_value);
 }
 
@@ skipping 18 matching lines @@
       "FontSettings.setUpFixedFontSample", font_value, size_value);
 }
 
 void FontSettingsHandler::SetUpMinimumFontSample() {
   base::FundamentalValue size_value(minimum_font_size_.GetValue());
   web_ui()->CallJavascriptFunction("FontSettings.setUpMinimumFontSample",
                                    size_value);
 }
 
 }  // namespace options