mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1502076 - Part 2: Remove the fastblock UI from the Control Centre r=johannh 

Depends on D9794

Differential Revision: https://phabricator.services.mozilla.com/D9795

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ehsan Akhgari 2018-10-26 06:55:20 +00:00
Родитель cb344bc7bf
Коммит 7bf4a87483
15 изменённых файлов: 9 добавлений и 241 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
browser/app/profile/firefox.js
Просмотреть файл

@ -1526,9 +1526,6 @@ pref("browser.contentblocking.global-toggle.enabled", false);
pref("dom.storage_access.enabled", true);
#endif
// Disable the UI for FastBlock in product.
pref("browser.contentblocking.fastblock.control-center.ui.enabled", false);
// Define a set of default features for the Content Blocking UI.
pref("browser.contentblocking.trackingprotection.ui.enabled", true);
pref("browser.contentblocking.trackingprotection.control-center.ui.enabled", true);

27
browser/base/content/browser-contentblocking.js
Просмотреть файл

@ -2,27 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
var FastBlock = {
reportBreakageLabel: "fastblock",
telemetryIdentifier: "fb",
PREF_ENABLED: "browser.fastblock.enabled",
PREF_UI_ENABLED: "browser.contentblocking.fastblock.control-center.ui.enabled",
get categoryItem() {
delete this.categoryItem;
return this.categoryItem = document.getElementById("identity-popup-content-blocking-category-fastblock");
},
init() {
XPCOMUtils.defineLazyPreferenceGetter(this, "enabled", this.PREF_ENABLED, false);
XPCOMUtils.defineLazyPreferenceGetter(this, "visible", this.PREF_UI_ENABLED, false);
},
isBlockerActivated(state) {
return state & Ci.nsIWebProgressListener.STATE_BLOCKED_SLOW_TRACKING_CONTENT;
},
};
var TrackingProtection = {
reportBreakageLabel: "trackingprotection",
telemetryIdentifier: "tp",
@ -214,7 +193,7 @@ var ContentBlocking = {
//
// It may also contain an init() and uninit() function, which will be called
// on ContentBlocking.init() and ContentBlocking.uninit().
blockers: [FastBlock, TrackingProtection, ThirdPartyCookies],
blockers: [TrackingProtection, ThirdPartyCookies],
get _baseURIForChannelClassifier() {
// Convert document URI into the format used by
@ -363,9 +342,6 @@ var ContentBlocking = {
body += `${ThirdPartyCookies.PREF_ENABLED}: ${Services.prefs.getIntPref(ThirdPartyCookies.PREF_ENABLED)}\n`;
body += `network.cookie.lifetimePolicy: ${Services.prefs.getIntPref("network.cookie.lifetimePolicy")}\n`;
body += `privacy.restrict3rdpartystorage.expiration: ${Services.prefs.getIntPref("privacy.restrict3rdpartystorage.expiration")}\n`;
body += `${FastBlock.PREF_ENABLED}: ${Services.prefs.getBoolPref(FastBlock.PREF_ENABLED)}\n`;
body += `${FastBlock.PREF_UI_ENABLED}: ${Services.prefs.getBoolPref(FastBlock.PREF_UI_ENABLED)}\n`;
body += `browser.fastblock.timeout: ${Services.prefs.getIntPref("browser.fastblock.timeout")}\n`;
let comments = document.getElementById("identity-popup-breakageReportView-collection-comments");
body += "\n**Comments**\n" + comments.value;
@ -469,7 +445,6 @@ var ContentBlocking = {
if (this.reportBreakageEnabled ||
(ThirdPartyCookies.reportBreakageEnabled &&
ThirdPartyCookies.activated &&
!FastBlock.activated &&
!TrackingProtection.activated)) {
this.reportBreakageButton.removeAttribute("hidden");
} else {

4
browser/base/content/test/trackingUI/browser_trackingUI_report_breakage.js
Просмотреть файл

@ -86,7 +86,6 @@ add_task(async function testReportBreakageVisibility() {
url: COOKIE_PAGE,
prefs: {
"browser.contentblocking.enabled": true,
"browser.fastblock.enabled": false,
"privacy.trackingprotection.enabled": false,
"network.cookie.cookieBehavior": Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER,
"browser.contentblocking.reportBreakage.enabled": false,
@ -213,9 +212,6 @@ add_task(async function testReportBreakage() {
"network.cookie.cookieBehavior",
"network.cookie.lifetimePolicy",
"privacy.restrict3rdpartystorage.expiration",
"browser.fastblock.enabled",
"browser.contentblocking.fastblock.control-center.ui.enabled",
"browser.fastblock.timeout",
];
let prefsBody = "";

91
browser/base/content/test/trackingUI/browser_trackingUI_state.js
Просмотреть файл

@ -17,30 +17,23 @@
const CB_PREF = "browser.contentblocking.enabled";
const TP_PREF = "privacy.trackingprotection.enabled";
const TP_PB_PREF = "privacy.trackingprotection.pbmode.enabled";
const FB_PREF = "browser.fastblock.enabled";
const FB_TIMEOUT_PREF = "browser.fastblock.timeout";
const FB_LIMIT_PREF = "browser.fastblock.limit";
const TPC_PREF = "network.cookie.cookieBehavior";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const COOKIE_PAGE = "http://not-tracking.example.com/browser/browser/base/content/test/trackingUI/cookiePage.html";
var ContentBlocking = null;
var FastBlock = null;
var TrackingProtection = null;
var ThirdPartyCookies = null;
var tabbrowser = null;
var gTrackingPageURL = TRACKING_PAGE;
registerCleanupFunction(function() {
TrackingProtection = ContentBlocking = FastBlock =
TrackingProtection = ContentBlocking =
ThirdPartyCookies = tabbrowser = null;
UrlClassifierTestUtils.cleanupTestTrackers();
Services.prefs.clearUserPref(TP_PREF);
Services.prefs.clearUserPref(TP_PB_PREF);
Services.prefs.clearUserPref(CB_PREF);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(FB_TIMEOUT_PREF);
Services.prefs.clearUserPref(FB_LIMIT_PREF);
Services.prefs.clearUserPref(TPC_PREF);
});
@ -110,14 +103,9 @@ function areTrackersBlocked(isPrivateBrowsing) {
let cbEnabled = Services.prefs.getBoolPref(CB_PREF);
let blockedByTP = cbEnabled &&
Services.prefs.getBoolPref(isPrivateBrowsing ? TP_PB_PREF : TP_PREF);
let blockedByFB = cbEnabled &&
Services.prefs.getBoolPref(FB_PREF) &&
// The timeout pref is only checked for completeness,
// checking it is technically unneeded for this test.
Services.prefs.getIntPref(FB_TIMEOUT_PREF) == 0;
let blockedByTPC = cbEnabled &&
Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER;
return blockedByTP || blockedByFB || blockedByTPC;
return blockedByTP || blockedByTPC;
}
function testTrackingPage(window) {
@ -155,14 +143,9 @@ function testTrackingPage(window) {
ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
let category;
if (Services.prefs.getBoolPref(FB_PREF)) {
category = "#identity-popup-content-blocking-category-fastblock";
} else {
category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
}
let category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
"Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
is(hidden(category + " > .identity-popup-content-blocking-category-state-label"), !blockedByTP,
@ -205,14 +188,9 @@ function testTrackingPageUnblocked(blockedByTP, window) {
ok(!hidden("#identity-popup-content-blocking-detected"), "blocking detected label is visible");
ok(!hidden("#identity-popup-content-blocking-category-list"), "category list is visible");
let category;
if (Services.prefs.getBoolPref(FB_PREF)) {
category = "#identity-popup-content-blocking-category-fastblock";
} else {
category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
}
let category = Services.prefs.getIntPref(TPC_PREF) == Ci.nsICookieService.BEHAVIOR_REJECT_TRACKER ?
"#identity-popup-content-blocking-category-3rdpartycookies" :
"#identity-popup-content-blocking-category-tracking-protection";
is(hidden(category + " > .identity-popup-content-blocking-category-add-blocking"), blockedByTP,
"Category item is" + (blockedByTP ? " not" : "") + " showing add blocking");
// Always hidden no matter if blockedByTP or not, since we have an exception.
@ -331,7 +309,6 @@ add_task(async function testNormalBrowsing() {
is(TrackingProtection.enabled, Services.prefs.getBoolPref(TP_PREF),
"TP.enabled is based on the original pref value");
Services.prefs.setBoolPref(FB_PREF, false);
Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT);
await testContentBlockingEnabled(tab);
@ -355,7 +332,6 @@ add_task(async function testNormalBrowsing() {
gBrowser.removeCurrentTab();
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(TPC_PREF);
});
@ -367,7 +343,6 @@ add_task(async function testPrivateBrowsing() {
// Set the normal mode pref to false to check the pbmode pref.
Services.prefs.setBoolPref(TP_PREF, false);
Services.prefs.setBoolPref(FB_PREF, false);
Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT);
ContentBlocking = tabbrowser.ownerGlobal.ContentBlocking;
@ -398,62 +373,13 @@ add_task(async function testPrivateBrowsing() {
privateWin.close();
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(TPC_PREF);
});
add_task(async function testFastBlock() {
await UrlClassifierTestUtils.addTestTrackers();
tabbrowser = gBrowser;
let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
Services.prefs.setBoolPref(FB_PREF, false);
Services.prefs.setIntPref(TPC_PREF, Ci.nsICookieService.BEHAVIOR_ACCEPT);
ContentBlocking = gBrowser.ownerGlobal.ContentBlocking;
ok(ContentBlocking, "CB is attached to the browser window");
FastBlock = gBrowser.ownerGlobal.FastBlock;
ok(FastBlock, "TP is attached to the browser window");
is(FastBlock.enabled, Services.prefs.getBoolPref(FB_PREF),
"FB.enabled is based on the original pref value");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.setBoolPref(FB_PREF, true);
Services.prefs.setIntPref(FB_TIMEOUT_PREF, 0);
Services.prefs.setIntPref(FB_LIMIT_PREF, 0);
ok(FastBlock.enabled, "FB is enabled after setting the pref");
Services.prefs.setBoolPref(CB_PREF, true);
ok(ContentBlocking.enabled, "CB is enabled after setting the pref");
await testContentBlockingEnabled(tab);
Services.prefs.setBoolPref(CB_PREF, false);
ok(!ContentBlocking.enabled, "CB is disabled after setting the pref");
await testContentBlockingDisabled(tab);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(FB_TIMEOUT_PREF);
Services.prefs.clearUserPref(FB_LIMIT_PREF);
Services.prefs.clearUserPref(TPC_PREF);
gBrowser.removeCurrentTab();
});
add_task(async function testThirdPartyCookies() {
await UrlClassifierTestUtils.addTestTrackers();
gTrackingPageURL = COOKIE_PAGE;
Services.prefs.setBoolPref(FB_PREF, false);
tabbrowser = gBrowser;
let tab = tabbrowser.selectedTab = BrowserTestUtils.addTab(tabbrowser);
@ -486,7 +412,6 @@ add_task(async function testThirdPartyCookies() {
await testContentBlockingDisabled(tab);
Services.prefs.clearUserPref(FB_PREF);
Services.prefs.clearUserPref(TPC_PREF);
gBrowser.removeCurrentTab();
});

2
browser/base/content/test/trackingUI/browser_trackingUI_telemetry.js
Просмотреть файл

@ -41,8 +41,6 @@ add_task(async function setup() {
is(scalars["contentblocking.enabled"], Services.prefs.getBoolPref("browser.contentblocking.enabled"),
"CB enabled status was recorded at startup");
is(scalars["contentblocking.fastblock_enabled"], Services.prefs.getBoolPref("browser.fastblock.enabled"),
"FB enabled status was recorded at startup");
is(scalars["contentblocking.exceptions"], 0, "no CB exceptions at startup");
});

8
browser/components/controlcenter/content/panel.inc.xul
Просмотреть файл

@ -82,14 +82,6 @@
crop="end">&contentBlocking.notDetected;</description>
<vbox id="identity-popup-content-blocking-category-list">
<hbox id="identity-popup-content-blocking-category-fastblock"
class="identity-popup-content-blocking-category" align="center" role="group">
<image class="identity-popup-content-blocking-category-icon fastblock-icon"/>
<label flex="1" class="identity-popup-content-blocking-category-label">&contentBlocking.fastBlock.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-state-label">&contentBlocking.fastBlock.blocking.label;</label>
<label flex="1" class="identity-popup-content-blocking-category-add-blocking text-link"
onclick="ContentBlocking.openPreferences('identityPopup-CB-fastblock'); gIdentityHandler.recordClick('fb_add_blocking');">&contentBlocking.fastBlock.add.label;</label>
</hbox>
<hbox id="identity-popup-content-blocking-category-tracking-protection"
class="identity-popup-content-blocking-category" align="center" role="group">
<image class="identity-popup-content-blocking-category-icon tracking-protection-icon"/>

3
browser/components/nsBrowserGlue.js
Просмотреть файл

@ -1364,9 +1364,6 @@ BrowserGlue.prototype = {
let cookieBehavior = Services.prefs.getIntPref("network.cookie.cookieBehavior");
Services.telemetry.getHistogramById("COOKIE_BEHAVIOR").add(cookieBehavior);
let fastBlockEnabled = Services.prefs.getBoolPref("browser.fastblock.enabled");
Services.telemetry.scalarSet("contentblocking.fastblock_enabled", fastBlockEnabled);
let contentBlockingEnabled = Services.prefs.getBoolPref("browser.contentblocking.enabled");
Services.telemetry.scalarSet("contentblocking.enabled", contentBlockingEnabled);

54
browser/components/uitour/test/browser_contentBlocking.js
Просмотреть файл

@ -3,8 +3,6 @@
const PREF_INTRO_COUNT = "browser.contentblocking.introCount";
const PREF_CB_ENABLED = "browser.contentblocking.enabled";
const PREF_TP_ENABLED = "privacy.trackingprotection.enabled";
const PREF_FB_ENABLED = "browser.fastblock.enabled";
const PREF_FB_TIMEOUT = "browser.fastblock.timeout";
const BENIGN_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/benignPage.html";
const TRACKING_PAGE = "http://tracking.example.org/browser/browser/base/content/test/trackingUI/trackingPage.html";
const TOOLTIP_PANEL = document.getElementById("UITourTooltip");
@ -16,8 +14,6 @@ registerCleanupFunction(function() {
UrlClassifierTestUtils.cleanupTestTrackers();
Services.prefs.clearUserPref(PREF_CB_ENABLED);
Services.prefs.clearUserPref(PREF_TP_ENABLED);
Services.prefs.clearUserPref(PREF_FB_ENABLED);
Services.prefs.clearUserPref(PREF_FB_TIMEOUT);
Services.prefs.clearUserPref(PREF_INTRO_COUNT);
});
@ -84,53 +80,3 @@ add_task(async function test_tracking() {
}, "timeout"), /timeout/, "Info panel shouldn't appear more than MAX_INTROS");
});
});
add_task(async function test_fastBlock() {
Services.prefs.clearUserPref(PREF_INTRO_COUNT);
Services.prefs.setBoolPref(PREF_TP_ENABLED, false);
Services.prefs.setBoolPref(PREF_FB_ENABLED, true);
Services.prefs.setIntPref(PREF_FB_TIMEOUT, 0);
info("Load a test page containing tracking elements for FastBlock");
allowOneIntro();
await BrowserTestUtils.withNewTab({gBrowser, url: TRACKING_PAGE}, async function() {
await new Promise((resolve, reject) => {
waitForPopupAtAnchor(TOOLTIP_PANEL, TOOLTIP_ANCHOR, resolve,
"Intro panel should appear");
});
is(Services.prefs.getIntPref(PREF_INTRO_COUNT), window.ContentBlocking.MAX_INTROS, "Check intro count increased");
let step2URL = Services.urlFormatter.formatURLPref("privacy.trackingprotection.introURL") +
"?step=2&newtab=true&variation=1";
let buttons = document.getElementById("UITourTooltipButtons");
info("Click the step text and nothing should happen");
let tabCount = gBrowser.tabs.length;
await EventUtils.synthesizeMouseAtCenter(buttons.children[0], {});
is(gBrowser.tabs.length, tabCount, "Same number of tabs should be open");
info("Resetting count to test that viewing the tour prevents future panels");
allowOneIntro();
let panelHiddenPromise = promisePanelElementHidden(window, TOOLTIP_PANEL);
let tabPromise = BrowserTestUtils.waitForNewTab(gBrowser, step2URL);
info("Clicking the main button");
EventUtils.synthesizeMouseAtCenter(buttons.children[1], {});
let tab = await tabPromise;
is(Services.prefs.getIntPref(PREF_INTRO_COUNT), window.ContentBlocking.MAX_INTROS,
"Check intro count is at the max after opening step 2");
is(gBrowser.tabs.length, tabCount + 1, "Tour step 2 tab opened");
await panelHiddenPromise;
ok(true, "Panel hid when the button was clicked");
BrowserTestUtils.removeTab(tab);
});
info("Open another tracking page and make sure we don't show the panel again");
await BrowserTestUtils.withNewTab(TRACKING_PAGE, async function() {
await Assert.rejects(waitForConditionPromise(() => {
return BrowserTestUtils.is_visible(TOOLTIP_PANEL);
}, "timeout"), /timeout/, "Info panel shouldn't appear more than MAX_INTROS");
});
});

18
browser/locales/en-US/chrome/browser/browser.dtd
Просмотреть файл

@ -964,24 +964,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY contentBlocking.disabled.tooltip "You have disabled Content Blocking.">
<!ENTITY contentBlocking.exception.tooltip "You have disabled Content Blocking for this site.">
<!ENTITY contentBlocking.fastBlock.label "Slow-Loading Trackers">
<!-- LOCALIZATION NOTE (contentBlocking.fastBlock.blocked.label):
This label signals that this type of content blocking is turned
ON and is successfully blocking malicious/slow content, so this is
a positive thing. It forms the end of the (imaginary) sentence
"Slow-Loading Trackers [are] Blocked"-->
<!ENTITY contentBlocking.fastBlock.blocked.label "Blocked">
<!-- LOCALIZATION NOTE (contentBlocking.fastBlock.blocking.label):
This label signals that this type of content blocking is turned
ON, so this is a positive thing. It forms the verb in (imaginary) sentence
"Firefox is blocking Slow-Loading Trackers"-->
<!ENTITY contentBlocking.fastBlock.blocking.label "Blocking">
<!-- LOCALIZATION NOTE (contentBlocking.fastBlock.add.label):
This is displayed as a link to preferences, where the user can add
this specific type of content blocking. When this text is shown
the type of content blocking is currently not enabled. -->
<!ENTITY contentBlocking.fastBlock.add.label "Add Blocking…">
<!ENTITY contentBlocking.trackingProtection2.label "All Detected Trackers">
<!ENTITY contentBlocking.trackingProtection3.label "Trackers">
<!-- LOCALIZATION NOTE (contentBlocking.trackingProtection.blocked.label):

8
browser/themes/shared/controlcenter/panel.inc.css
Просмотреть файл

@ -453,14 +453,6 @@ description#identity-popup-content-verifier,
display: none;
}
.fastblock-icon {
list-style-image: url(chrome://browser/skin/controlcenter/slowtrackers.svg);
}
#identity-popup-content-blocking-category-fastblock.blocked > .fastblock-icon {
list-style-image: url(chrome://browser/skin/controlcenter/slowtrackers-disabled.svg);
}
.tracking-protection-icon {
list-style-image: url(chrome://browser/skin/controlcenter/trackers.svg);
}

7
browser/themes/shared/controlcenter/slowtrackers-disabled.svg
Просмотреть файл

@ -1,7 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
<path fill="context-fill" d="M14,6c-1,0-1.746,1-2.246,1.992-.047-.193-.115-.38-.176-.57L8,11H9v1.5a.5.5,0,0,0,.5.5h2a.5.5,0,0,0,.5-.5V10h2a2,2,0,0,0,0-4Z"/>
<path fill="context-fill" d="M14.707,1.293a1,1,0,0,0-1.414,0L9.944,4.641A5.359,5.359,0,0,0,6,3C2,3,0,6.686,0,10H1v2.5a.5.5,0,0,0,.5.5h.086l-.293.293a1,1,0,1,0,1.414,1.414l12-12A1,1,0,0,0,14.707,1.293Z"/>
</svg>
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 724 B

6
browser/themes/shared/controlcenter/slowtrackers.svg
Просмотреть файл

@ -1,6 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M14,6c-1,0-1.746,1-2.246,1.992C11.112,5.355,9.2,3,6,3,2,3,0,6.686,0,10H1v2.5a.5.5,0,0,0,.5.5h2a.5.5,0,0,0,.5-.5V11H9v1.5a.5.5,0,0,0,.5.5h2a.5.5,0,0,0,.5-.5V10h2a2,2,0,0,0,0-4Z"/>
</svg>
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 549 B

2
browser/themes/shared/jar.inc.mn
Просмотреть файл

@ -29,8 +29,6 @@
skin/classic/browser/controlcenter/mcb-disabled.svg (../shared/controlcenter/mcb-disabled.svg)
skin/classic/browser/controlcenter/extension.svg (../shared/controlcenter/extension.svg)
skin/classic/browser/controlcenter/permissions.svg (../shared/controlcenter/permissions.svg)
skin/classic/browser/controlcenter/slowtrackers.svg (../shared/controlcenter/slowtrackers.svg)
skin/classic/browser/controlcenter/slowtrackers-disabled.svg (../shared/controlcenter/slowtrackers-disabled.svg)
skin/classic/browser/controlcenter/trackers.svg (../shared/controlcenter/trackers.svg)
skin/classic/browser/controlcenter/trackers-disabled.svg (../shared/controlcenter/trackers-disabled.svg)
skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg)

3
toolkit/components/telemetry/Events.yaml
Просмотреть файл

@ -618,14 +618,12 @@ security.ui.identitypopup:
record_in_processes:
- main
extra_keys:
fb: Whether FastBlock was active while the user opened the popup
tp: Whether Tracking Protection was active while the user opened the popup
cr: Whether Cookie Restrictions was active while the user opened the popup
products:
- firefox
click:
objects: [
"fb_add_blocking",
"tp_add_blocking",
"cookies_add_blocking",
"cb_prefs_button",
@ -648,7 +646,6 @@ security.ui.identitypopup:
record_in_processes:
- main
extra_keys:
fb: Whether FastBlock was active while the user interacted with the UI
tp: Whether Tracking Protection was active while the user interacted with the UI
cr: Whether Cookie Restrictions was active while the user interacted with the UI
products:

14
toolkit/components/telemetry/Scalars.yaml
Просмотреть файл

@ -456,20 +456,6 @@ contentblocking:
release_channel_collection: opt-out
record_in_processes:
- main
fastblock_enabled:
bug_numbers:
- 1484251
description: >
Whether FastBlock was enabled at startup.
expires: never
kind: boolean
notification_emails:
- jhofmann@mozilla.com
- pdol@mozilla.com
- seceng-telemetry@mozilla.com
release_channel_collection: opt-out
record_in_processes:
- main
exceptions:
bug_numbers:
- 1484251