When clearing private data: * We don't want offline website data to be cleared with cookies * We do want globalStorage for non-offline apps to be cleared with cookies. The attached patch clears these two sets separately. It's a bit ugly, suggestions for alternate approaches would be nice.

not blocking, but we'd take this if its ready.

Comment on attachment 283461 [details] [diff] [review] v1 biesi, you ok with the cache service change?

Comment on attachment 283461 [details] [diff] [review] v1 + if (type == NS_LITERAL_CSTRING("offline-app")) { type.EqualsLiteral sr=biesi

Comment on attachment 283461 [details] [diff] [review] v1 >diff --git a/browser/base/content/sanitize.js b/browser/base/content/sanitize.js >--- a/browser/base/content/sanitize.js >+++ b/browser/base/content/sanitize.js >@@ -118,16 +118,38 @@ Sanitizer.prototype = { > }, > > get canClear() > { > return true; > } > }, > >+ offlineApps: { >+ clear: function () >+ { >+ const cc = Components.classes; >+ const ci = Components.interfaces; uber-nit: Cc/Ci vs. cc/ci for consistency with everywhere else. >+ var cacheService = cc["@mozilla.org/network/cache-service;1"] >+ .getService(ci.nsICacheService); prevailing browser style is: var cacheService = Cc["@mozilla.org/network/cache-service;1"]. getService(ci.nsICacheService); leading dots only if they align. >diff --git a/browser/base/content/sanitize.xul b/browser/base/content/sanitize.xul >@@ -144,16 +145,20 @@ gSanitizePromptDialog.onReadGeneric();"/> >+ <checkbox label="&itemOfflineApps.label;" >+ accesskey="&itemOfflineApps.accesskey;" >+ preference="privacy.item.offlineApps" >+ onsyncfrompreference="return gSanitizePromptDialog.onReadGeneric tabs are evil, use spaces or this looks funny. r=me with nits addressed

Checking in browser/base/content/sanitize.js; /cvsroot/mozilla/browser/base/content/sanitize.js,v <-- sanitize.js new revision: 1.25; previous revision: 1.24 done Checking in browser/base/content/sanitize.xul; /cvsroot/mozilla/browser/base/content/sanitize.xul,v <-- sanitize.xul new revision: 1.16; previous revision: 1.15 done Checking in browser/components/preferences/sanitize.xul; /cvsroot/mozilla/browser/components/preferences/sanitize.xul,v <-- sanitize.xul new revision: 1.16; previous revision: 1.15 done Checking in browser/locales/en-US/chrome/browser/sanitize.dtd; /cvsroot/mozilla/browser/locales/en-US/chrome/browser/sanitize.dtd,v <-- sanitize.dtd new revision: 1.10; previous revision: 1.9 done Checking in dom/public/idl/storage/nsIDOMStorageManager.idl; /cvsroot/mozilla/dom/public/idl/storage/nsIDOMStorageManager.idl,v <-- nsIDOMStorageManager.idl new revision: 1.2; previous revision: 1.1 done Checking in dom/src/storage/nsDOMStorage.cpp; /cvsroot/mozilla/dom/src/storage/nsDOMStorage.cpp,v <-- nsDOMStorage.cpp new revision: 1.22; previous revision: 1.21 done Checking in dom/src/storage/nsDOMStorageDB.cpp; /cvsroot/mozilla/dom/src/storage/nsDOMStorageDB.cpp,v <-- nsDOMStorageDB.cpp new revision: 1.12; previous revision: 1.11 done Checking in dom/src/storage/nsDOMStorageDB.h; /cvsroot/mozilla/dom/src/storage/nsDOMStorageDB.h,v <-- nsDOMStorageDB.h new revision: 1.11; previous revision: 1.10 done Checking in netwerk/cache/src/nsCacheService.cpp; /cvsroot/mozilla/netwerk/cache/src/nsCacheService.cpp,v <-- nsCacheService.cpp new revision: 1.116; previous revision: 1.115 done

I haven't verified it but bug 413817 looks related.