Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/content_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/content_settings_handler.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 522 matching lines @@
       // TODO(estade): we pretend update_all() is always true.
       if (settings_details->update_all_types()) {
         UpdateAllExceptionsViewsFromModel();
       } else {
         UpdateExceptionsViewFromModel(
             ExContentSettingsType(settings_details->type()));
       }
       break;
     }
 
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      const std::string& pref_name =
-          *content::Details<std::string>(details).ptr();
-      if (pref_name == prefs::kGeolocationContentSettings)
-        UpdateGeolocationExceptionsView();
-      else if (pref_name == prefs::kPepperFlashSettingsEnabled)
-        RefreshFlashSettingsCache(false);
-
-      break;
-    }
-
     case chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED: {
       UpdateNotificationExceptionsView();
       break;
     }
 
     case chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED: {
       UpdateHandlersEnabledRadios();
       break;
     }
 
     default:
       OptionsPageUIHandler::Observe(type, source, details);
   }
 }
 
+void ContentSettingsHandler::OnPreferenceChanged(PrefServiceBase* service,
+                                                 const std::string& pref_name) {
+  if (pref_name == prefs::kGeolocationContentSettings)
+    UpdateGeolocationExceptionsView();
+  else if (pref_name == prefs::kPepperFlashSettingsEnabled)
+    RefreshFlashSettingsCache(false);
+}
+
 void ContentSettingsHandler::OnGetPermissionSettingsCompleted(
     uint32 request_id,
     bool success,
     PP_Flash_BrowserOperations_Permission default_permission,
     const ppapi::FlashSiteSettings& sites) {
   if (success &&
       request_id == flash_cameramic_settings_.last_refresh_request_id) {
     flash_cameramic_settings_.default_permission = default_permission;
     flash_cameramic_settings_.sites.clear();
     for (ppapi::FlashSiteSettings::const_iterator iter = sites.begin();
@@ skipping 739 matching lines @@
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace options