Use PrefChangeRegistrar everywhere

chrome/browser/cocoa/preferences_window_controller.h

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/prefs/pref_set_observer.h"
+#include "chrome/browser/prefs/pref_change_registrar.h"
 
 namespace PreferencesWindowControllerInternal {
 class PrefObserverBridge;
 class ManagedPrefsBannerState;
 }
 
 @class CustomHomePagesModel;
 @class FontLanguageSettingsController;
 class PrefService;
 class Profile;
@@ skipping 16 matching lines @@
 // to unit test).
 @interface PreferencesWindowController : NSWindowController {
  @private
   Profile* profile_;  // weak ref
   OptionsPage initialPage_;
   PrefService* prefs_;  // weak ref - Obtained from profile_ for convenience.
   // weak ref - Also obtained from profile_ for convenience.  May be NULL.
   ProfileSyncService* syncService_;
   scoped_ptr<PreferencesWindowControllerInternal::PrefObserverBridge>
       observer_;  // Watches for pref changes.
+  PrefChangeRegistrar registrar_;  // Manages pref change observer registration.
   scoped_nsobject<WindowSizeAutosaver> sizeSaver_;
   NSView* currentPrefsView_;  // weak ref - current prefs page view.
   scoped_ptr<PreferencesWindowControllerInternal::ManagedPrefsBannerState>
       bannerState_;
   BOOL managedPrefsBannerVisible_;
 
   IBOutlet NSToolbar* toolbar_;
   IBOutlet VerticalGradientView* managedPrefsBannerView_;
   IBOutlet NSImageView* managedPrefsBannerWarningImage_;
 
@@ skipping 171 matching lines @@
 
 // Returns the (normalized) page corresponding to the given toolbar item.
 // Should be called only after awakeFromNib is.
 - (OptionsPage)getPageForToolbarItem:(NSToolbarItem*)toolbarItem;
 
 // Returns the view corresponding to the given page.  Should be called
 // only after awakeFromNib is.
 - (NSView*)getPrefsViewForPage:(OptionsPage)page;
 
 @end