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 775039 - Combine clearing cookies and active logins. r=mfinkle

Browse Source
This commit is contained in:
Brian Nicholson 2012-07-19 13:28:25 -07:00
parent dd319c6623
commit ea726b6ffb
5 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -91,9 +91,8 @@
<!ENTITY pref_import_android "Import from Android">
<!ENTITY pref_private_data_history "Browsing &amp; download history">
<!ENTITY pref_private_data_formdata "Form &amp; search history">
<!ENTITY pref_private_data_cookies "Cookies">
<!ENTITY pref_private_data_cookies "Cookies &amp; 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">

5
mobile/android/base/resources/values/arrays.xml
View File

@ -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>

1
mobile/android/base/strings.xml.in
View File

@ -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>

4
mobile/android/chrome/content/browser.js
View File

@ -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);
}

10
mobile/android/chrome/content/sanitize.js
View File

@ -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.");