summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/preferences_window_controller.mm
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 17:12:42 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-28 17:12:42 +0000
commitb5068efe5808ef09f7d5dae5ed424dbf9fb584b2 (patch)
tree8c14c2501ed0e2d3fa7d9b190273d105e88271d7 /chrome/browser/cocoa/preferences_window_controller.mm
parent171b8526a17d7eaf945f56bce258f65931aa8a2a (diff)
downloadchromium_src-b5068efe5808ef09f7d5dae5ed424dbf9fb584b2.zip
chromium_src-b5068efe5808ef09f7d5dae5ed424dbf9fb584b2.tar.gz
chromium_src-b5068efe5808ef09f7d5dae5ed424dbf9fb584b2.tar.bz2
[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
Diffstat (limited to 'chrome/browser/cocoa/preferences_window_controller.mm')
-rw-r--r--chrome/browser/cocoa/preferences_window_controller.mm4
1 files changed, 1 insertions, 3 deletions
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) {