Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1085 matching lines @@
                                  const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED: {
       // Only update if the updated action box was for the active tab contents.
       WebContents* target_tab = content::Details<WebContents>(details).ptr();
       if (target_tab == GetTabContents()->web_contents())
         UpdatePageActions();
       break;
     }
 
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name_in = content::Details<std::string>(details).ptr();
-      DCHECK(pref_name_in);
-
-      if (*pref_name_in == prefs::kEditBookmarksEnabled)
-        UpdateStarIcon();
-      else
-        NOTREACHED();
-      break;
-    }
-
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       if (theme_service_->UsingNativeTheme()) {
         gtk_widget_modify_bg(tab_to_search_box_, GTK_STATE_NORMAL, NULL);
 
         GdkColor border_color = theme_service_->GetGdkColor(
             ThemeService::COLOR_FRAME);
         gtk_util::SetRoundedWindowBorderColor(tab_to_search_box_, border_color);
 
         gtk_util::UndoForceFontSize(security_info_label_);
         gtk_util::UndoForceFontSize(tab_to_search_full_label_);
@@ skipping 42 matching lines @@
       UpdateContentSettingsIcons();
       UpdateWebIntentsButton();
       break;
     }
 
     default:
       NOTREACHED();
   }
 }
 
+void LocationBarViewGtk::OnPreferenceChanged(PrefServiceBase* service,
+                                             const std::string& pref_name) {
+  if (pref_name == prefs::kEditBookmarksEnabled)
+    UpdateStarIcon();
+  else
+    NOTREACHED();
+}
+
 gboolean LocationBarViewGtk::HandleExpose(GtkWidget* widget,
                                           GdkEventExpose* event) {
   // If we're not using GTK theming, draw our own border over the edge pixels
   // of the background.
   if (!GtkThemeService::GetFrom(browser_->profile())->UsingNativeTheme()) {
     int left, center, right;
     if (popup_window_mode_) {
       left = right = IDR_LOCATIONBG_POPUPMODE_EDGE;
       center = IDR_LOCATIONBG_POPUPMODE_CENTER;
     } else {
@@ skipping 947 matching lines @@
 }
 
 void LocationBarViewGtk::PageActionViewGtk::InspectPopup(
     ExtensionAction* action) {
   ExtensionPopupGtk::Show(
       action->GetPopupUrl(current_tab_id_),
       owner_->browser_,
       event_box_.get(),
       ExtensionPopupGtk::SHOW_AND_INSPECT);
 }