Remove PrefObserver usages, batch 10.

chrome/browser/ui/views/tabs/browser_tab_strip_controller.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/tabs/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ skipping 159 matching lines @@
 
 BrowserTabStripController::BrowserTabStripController(Browser* browser,
                                                      TabStripModel* model)
     : model_(model),
       tabstrip_(NULL),
       browser_(browser),
       hover_tab_selector_(model) {
   model_->AddObserver(this);
 
   local_pref_registrar_.Init(g_browser_process->local_state());
-  local_pref_registrar_.Add(prefs::kTabStripLayoutType, this);
+  local_pref_registrar_.Add(
+      prefs::kTabStripLayoutType,
+      base::Bind(&BrowserTabStripController::UpdateLayoutType,
+                 base::Unretained(this)));
 }
 
 BrowserTabStripController::~BrowserTabStripController() {
   // When we get here the TabStrip is being deleted. We need to explicitly
   // cancel the menu, otherwise it may try to invoke something on the tabstrip
   // from its destructor.
   if (context_menu_contents_.get())
     context_menu_contents_->Cancel();
 
   model_->RemoveObserver(this);
@@ skipping 234 matching lines @@
 void BrowserTabStripController::TabMiniStateChanged(WebContents* contents,
                                                     int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
 void BrowserTabStripController::TabBlockedStateChanged(WebContents* contents,
                                                        int model_index) {
   SetTabDataAt(contents, model_index);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// BrowserTabStripController, content::NotificationObserver implementation:
-
-void BrowserTabStripController::OnPreferenceChanged(
-    PrefServiceBase* service,
-    const std::string& pref_name) {
-  if (pref_name == prefs::kTabStripLayoutType) {
-    UpdateLayoutType();
-  }
-}
-
 void BrowserTabStripController::SetTabRendererDataFromModel(
     WebContents* contents,
     int model_index,
     TabRendererData* data,
     TabStatus tab_status) {
   FaviconTabHelper* favicon_tab_helper =
       FaviconTabHelper::FromWebContents(contents);
 
   data->favicon = favicon_tab_helper->GetFavicon().AsImageSkia();
   data->network_state = TabContentsNetworkState(contents);
@@ skipping 58 matching lines @@
   SetTabRendererDataFromModel(contents, index, &data, NEW_TAB);
   tabstrip_->AddTabAt(index, data, is_active);
 }
 
 void BrowserTabStripController::UpdateLayoutType() {
   bool adjust_layout = false;
   TabStripLayoutType layout_type =
       DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
   tabstrip_->SetLayoutType(layout_type, adjust_layout);
 }