From 40a6c0b8f937bbec040295b35f96a8fd333b631c Mon Sep 17 00:00:00 2001 From: Johnathan Nightingale Date: Fri, 12 Jun 2009 00:03:35 -0400 Subject: [PATCH] Bug 497656: don't migrate passwords and offlineApps settings from sanitize-on-shutdown to CPD-dialog, since the dialog no longer has UI for controlling them, r=gavin --- browser/base/content/browser.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 317bc05dc4d0..0b621c865342 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -1590,7 +1590,10 @@ function initializeSanitizer() var clearOnShutdownBranch = prefService.getBranch("privacy.clearOnShutdown."); itemArray.forEach(function (name) { try { - cpdBranch.setBoolPref(name, itemBranch.getBoolPref(name)); + // don't migrate password or offlineApps clearing in the CRH dialog since + // there's no UI for those anymore. They default to false. bug 497656 + if (name != "passwords" && name != "offlineApps") + cpdBranch.setBoolPref(name, itemBranch.getBoolPref(name)); clearOnShutdownBranch.setBoolPref(name, itemBranch.getBoolPref(name)); } catch(e) {