Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/prefs/prefs_tab_helper.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/prefs/prefs_tab_helper.h"
 
 #include <string>
 
 #include "base/prefs/overlay_user_pref_store.h"
 #include "base/string_util.h"
@@ skipping 119 matching lines @@
     std::string pref_name_str = base::StringPrintf("%s.%s", map_name, script);
     const char* pref_name = pref_name_str.c_str();
     if (!prefs->FindPreference(pref_name))
       prefs->RegisterStringPref(pref_name, "", PrefService::UNSYNCABLE_PREF);
   }
 }
 
 // Registers |obs| to observe per-script font prefs under the path |map_name|.
 void RegisterFontFamilyMapObserver(PrefChangeRegistrar* registrar,
                                    const char* map_name,
-                                   content::NotificationObserver* obs) {
+                                   PrefObserver* obs) {
   for (size_t i = 0; i < prefs::kWebKitScriptsForFontFamilyMapsLength; ++i) {
     const char* script = prefs::kWebKitScriptsForFontFamilyMaps[i];
     std::string pref_name = base::StringPrintf("%s.%s", map_name, script);
     registrar->Add(pref_name.c_str(), obs);
   }
 }
 
 struct FontDefault {
   const char* pref_name;
   int resource_id;
@@ skipping 408 matching lines @@
   switch (type) {
     case chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED:
       UpdateWebPreferences();
       break;
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       UpdateRendererPreferences();
       break;
     }
 #endif
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name_in = content::Details<std::string>(details).ptr();
-      DCHECK(content::Source<PrefService>(source).ptr() ==
-                 GetProfile()->GetPrefs());
-      if (*pref_name_in == prefs::kDefaultCharset ||
-          StartsWithASCII(*pref_name_in, "webkit.webprefs.", true)) {
-        OnWebPrefChanged(*pref_name_in);
-      } else if (*pref_name_in == prefs::kDefaultZoomLevel ||
-                 *pref_name_in == prefs::kEnableReferrers ||
-                 *pref_name_in == prefs::kEnableDoNotTrack) {
-        UpdateRendererPreferences();
-      } else {
-        NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
-      }
-      break;
-    }
     default:
       NOTREACHED();
   }
 }
 
+void PrefsTabHelper::OnPreferenceChanged(PrefServiceBase* service,
+                                         const std::string& pref_name_in) {
+  DCHECK_EQ(GetProfile()->GetPrefs(), service);
+  if (pref_name_in == prefs::kDefaultCharset ||
+      StartsWithASCII(pref_name_in, "webkit.webprefs.", true)) {
+    OnWebPrefChanged(pref_name_in);
+  } else if (pref_name_in == prefs::kDefaultZoomLevel ||
+             pref_name_in == prefs::kEnableReferrers ||
+             pref_name_in == prefs::kEnableDoNotTrack) {
+    UpdateRendererPreferences();
+  } else {
+    NOTREACHED() << "unexpected pref change notification" << pref_name_in;
+  }
+}
+
 void PrefsTabHelper::UpdateWebPreferences() {
   web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(
       web_contents_->GetRenderViewHost()->GetWebkitPreferences());
 }
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
       web_contents_->GetMutableRendererPrefs(), GetProfile());
   web_contents_->GetRenderViewHost()->SyncRendererPrefs();
 }
@@ skipping 26 matching lines @@
       WebPreferences web_prefs =
           web_contents_->GetRenderViewHost()->GetWebkitPreferences();
       OverrideFontFamily(&web_prefs, generic_family, script, "");
       web_contents_->GetRenderViewHost()->UpdateWebkitPreferences(web_prefs);
       return;
     }
   }
 
   UpdateWebPreferences();
 }