Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: desktop-options.js

Issue 29693555: Issue 5813 - Check also window.doNotTrack to properly support Edge (Closed)
Patch Set: Created Feb. 9, 2018, 9:01 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: desktop-options.js
===================================================================
--- a/desktop-options.js
+++ b/desktop-options.js
@@ -918,10 +918,10 @@
{
setLinks("enable-acceptable-ads-description", link);
});
- setElementText(E("tracking-warning-1"), "options_tracking_warning_1",
+ setElementText(E("tracking-warning-1"), "options_tracking_warning_1",
saroyanm 2018/02/13 18:57:23 Note: This changes are already pushed (https://hg.
[getMessage("common_feature_privacy_title"),
- getMessage("options_acceptableAds_ads_label")]);
- setElementText(E("tracking-warning-3"), "options_tracking_warning_3",
+ getMessage("options_acceptableAds_ads_label")]);
+ setElementText(E("tracking-warning-3"), "options_tracking_warning_3",
[getMessage("options_acceptableAds_privacy_label")]);
getDocLink("privacy_friendly_ads", (link) =>
@@ -1087,7 +1087,9 @@
acceptableAdsPrivacy.setAttribute("aria-checked", true);
acceptableAdsPrivacy.setAttribute("aria-disabled", false);
- if (navigator.doNotTrack != 1)
+ // Edge uses window instead of navigator.
+ // Prefer navigator first since it's the standard.
+ if ((navigator.doNotTrack || window.doNotTrack) != 1)
acceptableAdsForm.classList.add("show-dnt-notification");
}
else
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld