Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/views/tabs/browser_tab_strip_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
 #define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/public/pref_change_registrar.h"
+#include "base/prefs/public/pref_observer.h"
 #include "chrome/browser/ui/search/search_model_observer.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
 #include "chrome/browser/ui/tabs/hover_tab_selector.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
-#include "content/public/browser/notification_observer.h"
 
 class BaseTab;
 class Browser;
 class TabContents;
 class TabStrip;
 class TabStripSelectionModel;
 struct TabRendererData;
 
 namespace content {
 class WebContents;
 }
 
 // An implementation of TabStripController that sources data from the
 // TabContentses in a TabStripModel.
 class BrowserTabStripController
     : public TabStripController,
       public TabStripModelObserver,
-      public content::NotificationObserver,
+      public PrefObserver,
       public chrome::search::SearchModelObserver,
       public chrome::search::ToolbarSearchAnimatorObserver {
  public:
   BrowserTabStripController(Browser* browser, TabStripModel* model);
   virtual ~BrowserTabStripController();
 
   void InitFromModel(TabStrip* tabstrip);
 
   TabStripModel* model() const { return model_; }
 
@@ skipping 62 matching lines @@
   // chrome::search::SearchModelObserver implementation:
   virtual void ModeChanged(const chrome::search::Mode& old_mode,
                            const chrome::search::Mode& new_mode) OVERRIDE;
 
   // chrome::search::ToolbarSearchAnimatorObserver implementation:
   virtual void OnToolbarBackgroundAnimatorProgressed() OVERRIDE;
   virtual void OnToolbarBackgroundAnimatorCanceled(
       content::WebContents* web_contents) OVERRIDE;
   virtual void OnToolbarSeparatorChanged() OVERRIDE {}
 
-  // content::NotificationObserver implementation:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // PrefObserver implementation:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
 
  protected:
   // The context in which SetTabRendererDataFromModel is being called.
   enum TabStatus {
     NEW_TAB,
     EXISTING_TAB
   };
 
   // Sets the TabRendererData from the TabStripModel.
   virtual void SetTabRendererDataFromModel(content::WebContents* contents,
@@ skipping 38 matching lines @@
 
   // Helper for performing tab selection as a result of dragging over a tab.
   HoverTabSelector hover_tab_selector_;
 
   PrefChangeRegistrar local_pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserTabStripController);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_