Add a scoped notifier for pref dictionaries / lists.

chrome/browser/cocoa/preferences_window_controller.mm

 // 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 "chrome/browser/cocoa/preferences_window_controller.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 931 matching lines @@
         SessionStartupPref::GetStartupPref(prefs_);
     [self setRestoreOnStartupIndex:startupPref.type];
   }
 
   // TODO(beng): Note that the kURLsToRestoreOnStartup pref is a mutable list,
   //             and changes to mutable lists aren't broadcast through the
   //             observer system, so this condition will
   //             never match. Once support for broadcasting such updates is
   //             added, this will automagically start to work, and this comment
   //             can be removed.
-  if (*prefName == prefs::kURLsToRestoreOnStartup) {
-    const SessionStartupPref startupPref =
-        SessionStartupPref::GetStartupPref(prefs_);
-    [customPagesSource_ setURLs:startupPref.urls];
-  }
+  // TODO(chron): We comment out this block right now because we have put in
+  //              broadcast for notifications, but there's some workaround
+  //              currently present that causes an infinite loop.
+  // if (*prefName == prefs::kURLsToRestoreOnStartup) {
+  //  const SessionStartupPref startupPref =
+  //      SessionStartupPref::GetStartupPref(prefs_);
+  //  [customPagesSource_ setURLs:startupPref.urls];
+  // }
 
   if (*prefName == prefs::kHomePageIsNewTabPage) {
     NSInteger useNewTabPage = newTabPageIsHomePage_.GetValue() ? 0 : 1;
     [self setNewTabPageIsHomePageIndex:useNewTabPage];
   }
   if (*prefName == prefs::kHomePage) {
     NSString* value = base::SysWideToNSString(homepage_.GetValue());
     [self setHomepageURL:value];
   }
 
@@ skipping 991 matching lines @@
     case OPTIONS_PAGE_ADVANCED:
       return underTheHoodView_;
     case OPTIONS_PAGE_DEFAULT:
     case OPTIONS_PAGE_COUNT:
       LOG(DFATAL) << "Invalid page value " << page;
   }
   return basicsView_;
 }
 
 @end