From b5068efe5808ef09f7d5dae5ed424dbf9fb584b2 Mon Sep 17 00:00:00 2001 From: "rsesek@chromium.org" Date: Wed, 28 Jul 2010 17:12:42 +0000 Subject: [Mac] Fix the custom homepages preferences to: 1) Make it actually work again. 2) Change the model so that it doesn't get into an infinite recursion cycle trying to update the model, notify observers, and then re-update. BUG=49320 TEST=Chromium-->Preferences. Add custom home pages. Close Preferences and reopen. They are still there. TEST=Open 3 web pages in tabs. Chromium-->Preferences. Use Current homepages. Close Preferences and reopen. They are still there. TEST=With custom homepages set, go to Chromium-->Preferences-->UtH-->Reset to Defaults. Go back to Basics. No more custom homepages. Review URL: http://codereview.chromium.org/3023023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53961 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/preferences_window_controller.mm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'chrome/browser/cocoa/preferences_window_controller.mm') diff --git a/chrome/browser/cocoa/preferences_window_controller.mm b/chrome/browser/cocoa/preferences_window_controller.mm index d7ec2de..cbf7b3f 100644 --- a/chrome/browser/cocoa/preferences_window_controller.mm +++ b/chrome/browser/cocoa/preferences_window_controller.mm @@ -884,9 +884,7 @@ class ManagedPrefsBannerState : public ManagedPrefsBannerBase { } if (*prefName == prefs::kURLsToRestoreOnStartup) { - const SessionStartupPref startupPref = - SessionStartupPref::GetStartupPref(prefs_); - [customPagesSource_ setURLs:startupPref.urls]; + [customPagesSource_ reloadURLs]; } if (*prefName == prefs::kHomePageIsNewTabPage) { -- cgit v1.1