wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 749931 - "Migration to a clean Firefox profile" feature doesn't suggest browser history migration (Part 2). r=gavin

Browse Source 
--HG--
extra : rebase_source : 677d0aeb8924e26ccf505ef133edfaf926d3df5f
This commit is contained in:
Matthew Noorenberghe 2012-07-08 13:33:21 -07:00
parent 1def53eae4
commit 196b57403d
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/locales/en-US/chrome/browser/migration/migration.properties
View File

@ -15,6 +15,8 @@ importedBookmarksFolder=From %S
importedSafariReadingList=Reading List (From Safari)
# Import Sources
# Note: When adding an import source for profile reset, add the string name to
# resetProfile.js if it should be listed in the reset dialog.
1_ie=Internet Options
1_safari=Preferences
1_chrome=Preferences

19
toolkit/content/resetProfile.js
View File

@ -55,19 +55,24 @@ function getMigratedData() {
#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
const MAX_MIGRATED_TYPES = 16;
// Loop over possible data to migrate to give the user a list of what will be preserved. This
// assumes that if the string for the data exists, then it will be migrated because calling
// getMigrateData now won't give the correct result.
// From migration.properties
const MIGRATED_TYPES = [
4, // History and Bookmarks
16, // Passwords
8, // Form History
2, // Cookies
];
// Loop over possible data to migrate to give the user a list of what will be preserved.
let dataTypes = [];
for (let i = 1; i < MAX_MIGRATED_TYPES; ++i) {
let itemID = Math.pow(2, i);
for (let itemID of MIGRATED_TYPES) {
try {
let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
dataTypes.push(typeName);
} catch (x) {
// Catch exceptions when the string for a data type doesn't exist because it's not migrated
// Catch exceptions when the string for a data type doesn't exist.
Components.utils.reportError(x);
}
}
return dataTypes;