Remove content::NotificationObserver dependency from most Prefs code.

chrome/browser/ui/ash/launcher/chrome_launcher_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_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model_observer.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/shelf_types.h"
 #include "base/basictypes.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 "base/timer.h"
 #include "chrome/browser/api/sync/profile_sync_service_observer.h"
 #include "chrome/browser/prefs/pref_service_observer.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
 class LauncherModel;
@@ skipping 17 matching lines @@
 // * Tabbed browsers and browser app windows have BrowserLauncherItemController,
 //   owned by the BrowserView instance.
 // * App shell windows have ShellWindowLauncherItemController, owned by
 //   ShellWindowLauncherController.
 // * Shortcuts have no LauncherItemController.
 class ChromeLauncherController
     : public ash::LauncherDelegate,
       public ash::LauncherModelObserver,
       public ash::ShellObserver,
       public content::NotificationObserver,
+      public PrefObserver,
       public ProfileSyncServiceObserver,
       public PrefServiceObserver {
  public:
   // Indicates if a launcher item is incognito or not.
   enum IncognitoState {
     STATE_INCOGNITO,
     STATE_NOT_INCOGNITO,
   };
 
   // Used to update the state of non plaform apps, as tab contents change.
@@ skipping 188 matching lines @@
   virtual void LauncherItemMoved(int start_index, int target_index) OVERRIDE;
   virtual void LauncherItemChanged(int index,
                                    const ash::LauncherItem& old_item) OVERRIDE;
   virtual void LauncherStatusChanged() OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
+  // Overridden from PrefObserver:
+  virtual void OnPreferenceChanged(PrefServiceBase* service,
+                                   const std::string& pref_name) OVERRIDE;
+
   // Overridden from ash::ShellObserver:
   virtual void OnShelfAlignmentChanged() OVERRIDE;
 
   // Overridden from ProfileSyncServiceObserver:
   virtual void OnStateChanged() OVERRIDE;
 
   // Overriden from PrefServiceObserver:
   virtual void OnIsSyncingChanged() OVERRIDE;
 
  private:
@@ skipping 89 matching lines @@
 
   PrefChangeRegistrar pref_change_registrar_;
 
   ProfileSyncService* observed_sync_service_;
   base::OneShotTimer<ChromeLauncherController> loading_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_