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

Back out 023218047be5 (bug 1175606) for depending on the backed out bug 1192416

Browse Source
This commit is contained in:
Phil Ringnalda 2015-08-07 22:06:51 -07:00
parent f465cd09ce
commit 94725b0373
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
browser/components/privatebrowsing/content/aboutPrivateBrowsing.js
View File

@ -60,6 +60,18 @@ document.addEventListener("DOMContentLoaded", function () {
// Update state that depends on preferences.
prefObserver.observe();
// This check can be removed when Tracking Protection is always available.
let tpUIEnabled = false;
try {
tpUIEnabled = Services.prefs.getBoolPref("privacy.trackingprotection.ui.enabled");
} catch (ex) {
// The preference is not available.
}
if (!tpUIEnabled) {
document.getElementById("trackingProtectionSection")
.setAttribute("hidden", "true");
}
}, false);
function openPrivateWindow() {

1
browser/components/privatebrowsing/test/browser/browser.ini
View File

@ -17,7 +17,6 @@ support-files =
[browser_privatebrowsing_DownloadLastDirWithCPS.js]
[browser_privatebrowsing_about.js]
tags = trackingprotection
[browser_privatebrowsing_aboutHomeButtonAfterWindowClose.js]
[browser_privatebrowsing_aboutSessionRestore.js]
[browser_privatebrowsing_cache.js]

4
browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about.js
View File

@ -46,12 +46,14 @@ function* testLinkOpensUrl({ win, tab, elementId, expectedUrl }) {
*/
add_task(function* test_links() {
// Use full version and change the remote URLs to prevent network access.
Services.prefs.setBoolPref("privacy.trackingprotection.ui.enabled", true);
Services.prefs.setCharPref("app.support.baseURL", "https://example.com/");
Services.prefs.setCharPref("privacy.trackingprotection.introURL",
"https://example.com/tour");
registerCleanupFunction(function () {
Services.prefs.clearUserPref("privacy.trackingprotection.introURL");
Services.prefs.clearUserPref("app.support.baseURL");
Services.prefs.clearUserPref("privacy.trackingprotection.ui.enabled");
});
let { win, tab } = yield openAboutPrivateBrowsing();
@ -75,10 +77,12 @@ add_task(function* test_links() {
*/
add_task(function* test_toggleTrackingProtection() {
// Use tour version but disable Tracking Protection.
Services.prefs.setBoolPref("privacy.trackingprotection.ui.enabled", true);
Services.prefs.setBoolPref("privacy.trackingprotection.pbmode.enabled",
true);
registerCleanupFunction(function () {
Services.prefs.clearUserPref("privacy.trackingprotection.pbmode.enabled");
Services.prefs.clearUserPref("privacy.trackingprotection.ui.enabled");
});
let { win, tab } = yield openAboutPrivateBrowsing();

2
modules/libpref/init/all.js
View File

@ -1087,7 +1087,7 @@ pref("privacy.donottrackheader.enabled", false);
// Enforce tracking protection in all modes
pref("privacy.trackingprotection.enabled", false);
// Enforce tracking protection in Private Browsing mode
pref("privacy.trackingprotection.pbmode.enabled", true);
pref("privacy.trackingprotection.pbmode.enabled", false);
pref("dom.event.contextmenu.enabled", true);
pref("dom.event.clipboardevents.enabled", true);