Index: chrome/browser/prefs/browser_prefs.cc |
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc |
index 48999c7cbfa2864d426975dbca233422a40a5219..98b8d06522d2161ef5336864dbabea9ca68d9a67 100644 |
--- a/chrome/browser/prefs/browser_prefs.cc |
+++ b/chrome/browser/prefs/browser_prefs.cc |
@@ -233,15 +233,14 @@ const char kShownAutoLaunchInfobarDeprecated[] = |
"browser.shown_autolaunch_infobar"; |
#endif // defined(OS_WIN) |
-// The SessionStartupPref used this pref to store the list of URLs to restore |
-// on startup, and then renamed it to "sessions.startup_urls" in M31. Migration |
-// code was added and the timestamp of when the migration happened was tracked |
-// by "session.startup_urls_migration_time". Both are obsolete now (2015/09) and |
-// should be removed once a few releases have happened. |
+// Deprecated 12/2015. |
gab
2015/12/02 21:27:18
This comment change belongs on your other CL I thi
sdefresne
2015/12/03 10:28:33
Ack, removed.
|
const char kURLsToRestoreOnStartupOld[] = "session.urls_to_restore_on_startup"; |
const char kRestoreStartupURLsMigrationTime[] = |
"session.startup_urls_migration_time"; |
+// Deprecated 12/2015. |
+const char kRestoreOnStartupMigrated[] = "session.restore_on_startup_migrated"; |
+ |
} // namespace |
namespace chrome { |
@@ -530,6 +529,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
registry->RegisterListPref(kURLsToRestoreOnStartupOld); |
registry->RegisterInt64Pref(kRestoreStartupURLsMigrationTime, 0); |
+ registry->RegisterBooleanPref(kRestoreOnStartupMigrated, false); |
} |
void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { |
@@ -581,6 +581,9 @@ void MigrateObsoleteProfilePrefs(Profile* profile) { |
// Added 12/1015. |
profile_prefs->ClearPref(kURLsToRestoreOnStartupOld); |
profile_prefs->ClearPref(kRestoreStartupURLsMigrationTime); |
+ |
+ // Added 12/2015. |
+ profile_prefs->ClearPref(kRestoreOnStartupMigrated); |
} |
} // namespace chrome |