Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/views/toolbar_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/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 590 matching lines @@
   chrome::ExecuteCommandWithDisposition(browser_, command, disposition);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, content::NotificationObserver implementation:
 
 void ToolbarView::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
   switch (type) {
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name = content::Details<std::string>(details).ptr();
-      if (*pref_name == prefs::kShowHomeButton) {
-        Layout();
-        SchedulePaint();
-      }
-      break;
-    }
     case chrome::NOTIFICATION_UPGRADE_RECOMMENDED:
     case chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_BADGE_CHANGE:
     case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
       UpdateAppMenuState();
       break;
 #if defined(OS_WIN)
     case chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED:
       ShowCriticalNotification();
       break;
 #endif
     default:
       NOTREACHED();
   }
 }
 
+void ToolbarView::OnPreferenceChanged(PrefServiceBase* service,
+                                      const std::string& pref_name) {
+  if (pref_name == prefs::kShowHomeButton) {
+    Layout();
+    SchedulePaint();
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, ui::AcceleratorProvider implementation:
 
 bool ToolbarView::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
   // anywhere so we need to check for them explicitly here.
   // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings.
   switch (command_id) {
     case IDC_CUT:
@@ skipping 411 matching lines @@
   // LocationBarContainer is not a child of the ToolbarView.
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToTarget(this, location_bar_container_->parent(),
                                     &origin);
   gfx::Rect target_bounds(origin, bounds.size());
   if (location_bar_container_->GetTargetBounds() != target_bounds) {
     location_bar_container_->SetInToolbar(true);
     location_bar_container_->SetBoundsRect(target_bounds);
   }
 }