Unified Diff: new-options.js
Issue 29558669:
Issue 5807 - Remove Acceptable Ads notificaiton (Closed)
Patch Set:
Created Sept. 28, 2017, 5:41 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« new-options.html ('k')
|
skin/new-options.css » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: new-options.js |
| =================================================================== |
| --- a/new-options.js |
| +++ b/new-options.js |
| @@ -1050,23 +1050,6 @@ |
| return url == acceptableAdsUrl || url == acceptableAdsPrivacyUrl; |
| } |
| - function hasPrivacyConflict() |
| - { |
| - let acceptableAdsList = subscriptionsMap[acceptableAdsUrl]; |
| - let privacyList = null; |
| - for (let url in subscriptionsMap) |
| - { |
| - let subscription = subscriptionsMap[url]; |
| - if (subscription.recommended == "privacy") |
| - { |
| - privacyList = subscription; |
| - break; |
| - } |
| - } |
| - return acceptableAdsList && acceptableAdsList.disabled == false && |
| - privacyList && privacyList.disabled == false; |
| - } |
| - |
| function populateLists() |
| { |
| subscriptionsMap = Object.create(null); |
| @@ -1240,16 +1223,6 @@ |
| if (isAcceptableAds(url)) |
| setAcceptableAds(); |
| - if ((url == acceptableAdsUrl || recommended == "privacy") && |
| - hasPrivacyConflict()) |
| - { |
| - getPref("ui_warn_tracking", (showTrackingWarning) => |
| - { |
| - if (showTrackingWarning) |
| - openDialog("tracking"); |
| - }); |
| - } |
| - |
| collections.filterLists.addItem(subscription); |
| break; |
| case "removed": |
| @@ -1398,8 +1371,7 @@ |
| ext.backgroundPage.sendMessage({ |
| type: "prefs.listen", |
| filter: ["notifications_ignoredcategories", "notifications_showui", |
| - "show_devtools_panel", "shouldShowBlockElementMenu", |
| - "ui_warn_tracking"] |
| + "show_devtools_panel", "shouldShowBlockElementMenu"] |
| }); |
| ext.backgroundPage.sendMessage({ |
| type: "subscriptions.listen", |
« no previous file with comments
|
« new-options.html ('k')
|
skin/new-options.css » ('j')
|
no next file with comments »
