diff options
Diffstat (limited to 'chrome/browser/prefs/session_startup_pref.cc')
| -rw-r--r-- | chrome/browser/prefs/session_startup_pref.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/prefs/session_startup_pref.cc b/chrome/browser/prefs/session_startup_pref.cc index 6ca978e..477c73e 100644 --- a/chrome/browser/prefs/session_startup_pref.cc +++ b/chrome/browser/prefs/session_startup_pref.cc @@ -224,16 +224,8 @@ SessionStartupPref::Type SessionStartupPref::PrefValueToType(int pref_value) { bool SessionStartupPref::DidStartupPrefChange(Profile* profile) { ProtectedPrefsWatcher* prefs_watcher = ProtectorServiceFactory::GetForProfile(profile)->GetPrefsWatcher(); - if (prefs_watcher->DidPrefChange(prefs::kRestoreOnStartup)) - return true; -#if defined(OS_MACOSX) - // On Mac OS, default value for |kRestoreOnStartup| depends on system - // settings and may be different from one run to another. - PrefService* prefs = profile->GetPrefs(); - if (prefs->FindPreference(prefs::kRestoreOnStartup)->IsDefaultValue()) - return false; -#endif - return prefs_watcher->DidPrefChange(prefs::kURLsToRestoreOnStartup); + return prefs_watcher->DidPrefChange(prefs::kRestoreOnStartup) || + prefs_watcher->DidPrefChange(prefs::kURLsToRestoreOnStartup); } // static |