Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 568613 - Remove browser.history_expire_days usage from tree. r=mak

Browse Source
This commit is contained in:
Jefry Lagrange 2014-04-24 07:47:00 -04:00
parent a708b26e65
commit ce98a40425
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/metro/profile/metro.js
View File

@ -334,8 +334,6 @@ pref("browser.urlbar.match.url", "@");
pref("browser.history.grouping", "day");
pref("browser.history.showSessions", false);
pref("browser.sessionhistory.max_entries", 50);
pref("browser.history_expire_days", 180);
pref("browser.history_expire_days_min", 90);
pref("browser.history_expire_sites", 40000);
pref("browser.places.migratePostDataAnnotations", true);
pref("browser.places.updateRecentTagsUri", true);

2
mobile/android/app/mobile.js
View File

@ -311,8 +311,6 @@ pref("browser.urlbar.autocomplete.search_threshold", 5);
pref("browser.history.grouping", "day");
pref("browser.history.showSessions", false);
pref("browser.sessionhistory.max_entries", 50);
pref("browser.history_expire_days", 180);
pref("browser.history_expire_days_min", 90);
pref("browser.history_expire_sites", 40000);
pref("browser.places.migratePostDataAnnotations", true);
pref("browser.places.updateRecentTagsUri", true);

15
toolkit/components/places/nsNavHistory.cpp
View File

@ -454,20 +454,7 @@ void
nsNavHistory::LoadPrefs()
{
// History preferences.
// Check the old preference and migrate disabled state.
int32_t oldDaysPref = Preferences::GetInt("browser.history_expire_days", -1);
if (oldDaysPref >= 0) {
if (oldDaysPref == 0) {
// Preserve history disabled state, for privacy reasons.
Preferences::SetBool(PREF_HISTORY_ENABLED, false);
mHistoryEnabled = false;
}
// Clear the old pref, otherwise we will keep using it.
Preferences::ClearUser("browser.history_expire_days");
}
else {
mHistoryEnabled = Preferences::GetBool(PREF_HISTORY_ENABLED, true);
}
mHistoryEnabled = Preferences::GetBool(PREF_HISTORY_ENABLED, true);
// Frecency preferences.
#define FRECENCY_PREF(_prop, _pref) \