Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/webui/options/browser_options_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/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 846 matching lines @@
   // InitializePage() will update the UI at the end of the load).
   if (!page_initialized_)
     return;
 
   if (type == chrome::NOTIFICATION_BROWSER_THEME_CHANGED) {
     ObserveThemeChanged();
 #if defined(OS_CHROMEOS)
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
     UpdateAccountPicture();
 #endif
-  } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    std::string* pref_name = content::Details<std::string>(details).ptr();
-    if (*pref_name == prefs::kDefaultBrowserSettingEnabled) {
-      UpdateDefaultBrowserState();
-    } else if (*pref_name == prefs::kDownloadExtensionsToOpen) {
-      SetupAutoOpenFileTypes();
-#if !defined(OS_CHROMEOS)
-    } else if (proxy_prefs_.IsObserved(*pref_name)) {
-      SetupProxySettingsSection();
-#endif  // !defined(OS_CHROMEOS)
-    } else if ((*pref_name == prefs::kCloudPrintEmail) ||
-               (*pref_name == prefs::kCloudPrintProxyEnabled)) {
-#if !defined(OS_CHROMEOS)
-      if (cloud_print_connector_ui_enabled_)
-        SetupCloudPrintConnectorSection();
-#endif
-    } else if (*pref_name == prefs::kWebKitDefaultFontSize) {
-      SetupFontSizeSelector();
-    } else if (*pref_name == prefs::kDefaultZoomLevel) {
-      SetupPageZoomSelector();
-    } else {
-      NOTREACHED();
-    }
   } else if (type == chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED) {
     if (multiprofile_)
       SendProfilesInfo();
   } else {
     NOTREACHED();
   }
+}
+
+void BrowserOptionsHandler::OnPreferenceChanged(PrefServiceBase* service,
+                                                const std::string& pref_name) {
+  if (pref_name == prefs::kDefaultBrowserSettingEnabled) {
+    UpdateDefaultBrowserState();
+  } else if (pref_name == prefs::kDownloadExtensionsToOpen) {
+    SetupAutoOpenFileTypes();
+#if !defined(OS_CHROMEOS)
+  } else if (proxy_prefs_.IsObserved(pref_name)) {
+    SetupProxySettingsSection();
+#endif  // !defined(OS_CHROMEOS)
+  } else if ((pref_name == prefs::kCloudPrintEmail) ||
+             (pref_name == prefs::kCloudPrintProxyEnabled)) {
+#if !defined(OS_CHROMEOS)
+    if (cloud_print_connector_ui_enabled_)
+      SetupCloudPrintConnectorSection();
+#endif
+  } else if (pref_name == prefs::kWebKitDefaultFontSize) {
+    SetupFontSizeSelector();
+  } else if (pref_name == prefs::kDefaultZoomLevel) {
+    SetupPageZoomSelector();
+  } else {
+    NOTREACHED();
+  }
 }
 
 void BrowserOptionsHandler::ToggleAutoLaunch(const ListValue* args) {
 #if defined(OS_WIN)
   if (!auto_launch_trial::IsInAutoLaunchGroup())
     return;
 
   bool enable;
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(args->GetBoolean(0, &enable));
@@ skipping 509 matching lines @@
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   }
   StringValue label(label_str);
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.setupProxySettingsSection", disabled, label);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 }  // namespace options