зеркало из https://github.com/mozilla/gecko-dev.git
Bug 775039 - Combine clearing cookies and active logins. r=mfinkle
This commit is contained in:
Родитель
f95b58411d
Коммит
75dd8a8ea3
|
@ -91,9 +91,8 @@
|
|||
<!ENTITY pref_import_android "Import from Android">
|
||||
<!ENTITY pref_private_data_history "Browsing & download history">
|
||||
<!ENTITY pref_private_data_formdata "Form & search history">
|
||||
<!ENTITY pref_private_data_cookies "Cookies">
|
||||
<!ENTITY pref_private_data_cookies "Cookies & active logins">
|
||||
<!ENTITY pref_private_data_cache "Cache">
|
||||
<!ENTITY pref_private_data_sessions "Active logins">
|
||||
<!ENTITY pref_private_data_offlineApps "Offline website data">
|
||||
<!ENTITY pref_private_data_siteSettings "Site preferences">
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@
|
|||
<item>@string/pref_private_data_formdata</item>
|
||||
<item>@string/pref_private_data_cookies</item>
|
||||
<item>@string/pref_private_data_cache</item>
|
||||
<item>@string/pref_private_data_sessions</item>
|
||||
<item>@string/pref_private_data_offlineApps</item>
|
||||
<item>@string/pref_private_data_siteSettings</item>
|
||||
</string-array>
|
||||
|
@ -65,14 +64,12 @@
|
|||
<item>true</item>
|
||||
<item>true</item>
|
||||
<item>true</item>
|
||||
<item>true</item>
|
||||
</string-array>
|
||||
<string-array name="pref_private_data_keys">
|
||||
<item>private.data.history_downloads</item>
|
||||
<item>private.data.formdata</item>
|
||||
<item>private.data.cookies</item>
|
||||
<item>private.data.cookies_sessions</item>
|
||||
<item>private.data.cache</item>
|
||||
<item>private.data.sessions</item>
|
||||
<item>private.data.offlineApps</item>
|
||||
<item>private.data.siteSettings</item>
|
||||
</string-array>
|
||||
|
|
|
@ -97,7 +97,6 @@
|
|||
<string name="pref_private_data_formdata">&pref_private_data_formdata;</string>
|
||||
<string name="pref_private_data_cookies">&pref_private_data_cookies;</string>
|
||||
<string name="pref_private_data_cache">&pref_private_data_cache;</string>
|
||||
<string name="pref_private_data_sessions">&pref_private_data_sessions;</string>
|
||||
<string name="pref_private_data_offlineApps">&pref_private_data_offlineApps;</string>
|
||||
<string name="pref_private_data_siteSettings">&pref_private_data_siteSettings;</string>
|
||||
<string name="pref_import_android">&pref_import_android;</string>
|
||||
|
|
|
@ -804,6 +804,10 @@ var BrowserApp = {
|
|||
sanitizer.clearItem("history");
|
||||
sanitizer.clearItem("downloads");
|
||||
break;
|
||||
case "cookies_sessions":
|
||||
sanitizer.clearItem("cookies");
|
||||
sanitizer.clearItem("sessions");
|
||||
break;
|
||||
default:
|
||||
sanitizer.clearItem(key);
|
||||
}
|
||||
|
|
|
@ -79,17 +79,7 @@ Sanitizer.prototype = {
|
|||
clear: function ()
|
||||
{
|
||||
Services.cookies.removeAll();
|
||||
},
|
||||
|
||||
get canClear()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
},
|
||||
|
||||
geolocation: {
|
||||
clear: function ()
|
||||
{
|
||||
// clear any network geolocation provider sessions
|
||||
try {
|
||||
var branch = Services.prefs.getBranch("geo.wifi.access_token.");
|
||||
|
|
Загрузка…
Ссылка в новой задаче