Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/views/location_bar/location_bar_view.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/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 1567 matching lines @@
   // If the browser is no longer active, let's not show the info bubble, as this
   // would make the browser the active window again.
   if (location_entry_view_ && location_entry_view_->GetWidget()->IsActive())
     ShowFirstRunBubble();
 }
 
 void LocationBarView::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* name = content::Details<std::string>(details).ptr();
-      if (*name == prefs::kEditBookmarksEnabled)
-        Update(NULL);
-      break;
-    }
-
     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;
     }
 
     default:
       NOTREACHED() << "Unexpected notification.";
   }
 }
 
+void LocationBarView::OnPreferenceChanged(PrefServiceBase* service,
+                                          const std::string& pref_name) {
+  if (pref_name == prefs::kEditBookmarksEnabled)
+    Update(NULL);
+}
+
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }
@@ skipping 66 matching lines @@
 }
 
 void LocationBarView::CleanupFadeAnimation() {
   // Since we're no longer animating we don't need our layer.
   SetPaintToLayer(false);
   // Bubble labels don't need a transparent background anymore.
   ev_bubble_view_->SetLabelBackgroundColor(SK_ColorWHITE);
   selected_keyword_view_->SetLabelBackgroundColor(SK_ColorWHITE);
 }
 #endif  // USE_AURA