Remove PrefObserver usages, batch 10.

chrome/browser/ui/views/toolbar_view.cc

 // Copyright 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 269 matching lines @@
   AddChildView(back_);
   AddChildView(forward_);
   AddChildView(reload_);
   AddChildView(home_);
   AddChildView(location_bar_);
   AddChildView(browser_actions_);
   AddChildView(app_menu_);
 
   location_bar_->Init();
   show_home_button_.Init(prefs::kShowHomeButton,
-                         browser_->profile()->GetPrefs(), this);
+                         browser_->profile()->GetPrefs(),
+                         base::Bind(&ToolbarView::OnShowHomeButtonChanged,
+                                    base::Unretained(this)));
 
   browser_actions_->Init();
 
   // Accessibility specific tooltip text.
   if (content::BrowserAccessibilityState::GetInstance()->
           IsAccessibleBrowser()) {
     back_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_BACK));
     forward_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLTIP_FORWARD));
@@ skipping 250 matching lines @@
 #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 324 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::STATE_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::STATE_HOVERED));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::STATE_PRESSED));
   SchedulePaint();
 }
+
+void ToolbarView::OnShowHomeButtonChanged() {
+  Layout();
+  SchedulePaint();
+}