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