Remove SecurityUI telemetry.
This commit is contained in:
parent
68f9b202e9
commit
adfc767c2f
|
@ -145,10 +145,6 @@ const gXPInstallObserver = {
|
|||
for (let install of installInfo.installs)
|
||||
install.install();
|
||||
installInfo = null;
|
||||
|
||||
Services.telemetry
|
||||
.getHistogramById("SECURITY_UI")
|
||||
.add(Ci.nsISecurityUITelemetry.WARNING_CONFIRM_ADDON_INSTALL_CLICK_THROUGH);
|
||||
};
|
||||
break;
|
||||
}
|
||||
|
@ -208,10 +204,6 @@ const gXPInstallObserver = {
|
|||
options);
|
||||
|
||||
removeNotificationOnEnd(popup, installInfo.installs);
|
||||
|
||||
Services.telemetry
|
||||
.getHistogramById("SECURITY_UI")
|
||||
.add(Ci.nsISecurityUITelemetry.WARNING_CONFIRM_ADDON_INSTALL);
|
||||
},
|
||||
|
||||
observe: function (aSubject, aTopic, aData)
|
||||
|
@ -262,8 +254,6 @@ const gXPInstallObserver = {
|
|||
messageString = gNavigatorBundle.getFormattedString("xpinstallPromptMessage",
|
||||
[brandShortName]);
|
||||
|
||||
let secHistogram = Components.classes["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry).getHistogramById("SECURITY_UI");
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_ADDON_ASKING_PREVENTED);
|
||||
let popup = PopupNotifications.show(browser, notificationID,
|
||||
messageString, anchorID,
|
||||
null, null, options);
|
||||
|
@ -273,17 +263,14 @@ const gXPInstallObserver = {
|
|||
messageString = gNavigatorBundle.getFormattedString("xpinstallPromptMessage",
|
||||
[brandShortName]);
|
||||
|
||||
let secHistogram = Components.classes["@mozilla.org/base/telemetry;1"].getService(Ci.nsITelemetry).getHistogramById("SECURITY_UI");
|
||||
action = {
|
||||
label: gNavigatorBundle.getString("xpinstallPromptAllowButton"),
|
||||
accessKey: gNavigatorBundle.getString("xpinstallPromptAllowButton.accesskey"),
|
||||
callback: function() {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_ADDON_ASKING_PREVENTED_CLICK_THROUGH);
|
||||
installInfo.install();
|
||||
}
|
||||
};
|
||||
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_ADDON_ASKING_PREVENTED);
|
||||
let popup = PopupNotifications.show(browser, notificationID,
|
||||
messageString, anchorID,
|
||||
action, null, options);
|
||||
|
|
|
@ -2784,15 +2784,10 @@ var BrowserOnClick = {
|
|||
},
|
||||
|
||||
onCertError: function (browser, elementId, isTopFrame, location, securityInfoAsString) {
|
||||
let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
|
||||
let securityInfo;
|
||||
|
||||
switch (elementId) {
|
||||
case "exceptionDialogButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION);
|
||||
}
|
||||
|
||||
securityInfo = getSecurityInfo(securityInfoAsString);
|
||||
let sslStatus = securityInfo.QueryInterface(Ci.nsISSLStatusProvider)
|
||||
.SSLStatus;
|
||||
|
@ -2820,64 +2815,27 @@ var BrowserOnClick = {
|
|||
break;
|
||||
|
||||
case "returnButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_GET_ME_OUT_OF_HERE);
|
||||
}
|
||||
goBackFromErrorPage();
|
||||
break;
|
||||
|
||||
case "advancedButton":
|
||||
if (isTopFrame) {
|
||||
secHistogram.add(Ci.nsISecurityUITelemetry.WARNING_BAD_CERT_TOP_UNDERSTAND_RISKS);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
onAboutBlocked: function (elementId, reason, isTopFrame, location) {
|
||||
// Depending on what page we are displaying here (malware/phishing/unwanted)
|
||||
// use the right strings and links for each.
|
||||
let bucketName = "";
|
||||
let sendTelemetry = false;
|
||||
if (reason === 'malware') {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_MALWARE_PAGE_";
|
||||
} else if (reason === 'phishing') {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_PHISHING_PAGE_";
|
||||
} else if (reason === 'unwanted') {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_UNWANTED_PAGE_";
|
||||
}
|
||||
let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
|
||||
let nsISecTel = Ci.nsISecurityUITelemetry;
|
||||
bucketName += isTopFrame ? "TOP_" : "FRAME_";
|
||||
switch (elementId) {
|
||||
case "getMeOutButton":
|
||||
if (sendTelemetry) {
|
||||
secHistogram.add(nsISecTel[bucketName + "GET_ME_OUT_OF_HERE"]);
|
||||
}
|
||||
getMeOutOfHere();
|
||||
break;
|
||||
|
||||
case "reportButton":
|
||||
// This is the "Why is this site blocked" button. We redirect
|
||||
// to the generic page describing phishing/malware protection.
|
||||
|
||||
// We log even if malware/phishing/unwanted info URL couldn't be found:
|
||||
// the measurement is for how many users clicked the WHY BLOCKED button
|
||||
if (sendTelemetry) {
|
||||
secHistogram.add(nsISecTel[bucketName + "WHY_BLOCKED"]);
|
||||
}
|
||||
openHelpLink("phishing-malware", false, "current");
|
||||
break;
|
||||
|
||||
case "ignoreWarningButton":
|
||||
if (gPrefService.getBoolPref("browser.safebrowsing.allowOverride")) {
|
||||
if (sendTelemetry) {
|
||||
secHistogram.add(nsISecTel[bucketName + "IGNORE_WARNING"]);
|
||||
}
|
||||
this.ignoreWarningButton(reason);
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -437,26 +437,12 @@ GeolocationPermissionPrompt.prototype = {
|
|||
},
|
||||
|
||||
get promptActions() {
|
||||
// We collect Telemetry data on Geolocation prompts and how users
|
||||
// respond to them. The probe keys are a bit verbose, so let's alias them.
|
||||
const SHARE_LOCATION =
|
||||
Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST_SHARE_LOCATION;
|
||||
const ALWAYS_SHARE =
|
||||
Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST_ALWAYS_SHARE;
|
||||
const NEVER_SHARE =
|
||||
Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST_NEVER_SHARE;
|
||||
|
||||
let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
|
||||
|
||||
let actions = [{
|
||||
label: gBrowserBundle.GetStringFromName("geolocation.shareLocation"),
|
||||
accessKey:
|
||||
gBrowserBundle.GetStringFromName("geolocation.shareLocation.accesskey"),
|
||||
action: null,
|
||||
expireType: null,
|
||||
callback: function() {
|
||||
secHistogram.add(SHARE_LOCATION);
|
||||
},
|
||||
}];
|
||||
|
||||
if (!this.principal.URI.schemeIs("file")) {
|
||||
|
@ -467,9 +453,6 @@ GeolocationPermissionPrompt.prototype = {
|
|||
gBrowserBundle.GetStringFromName("geolocation.alwaysShareLocation.accesskey"),
|
||||
action: Ci.nsIPermissionManager.ALLOW_ACTION,
|
||||
expireType: null,
|
||||
callback: function() {
|
||||
secHistogram.add(ALWAYS_SHARE);
|
||||
},
|
||||
});
|
||||
|
||||
// Never share location action.
|
||||
|
@ -479,9 +462,6 @@ GeolocationPermissionPrompt.prototype = {
|
|||
gBrowserBundle.GetStringFromName("geolocation.neverShareLocation.accesskey"),
|
||||
action: Ci.nsIPermissionManager.DENY_ACTION,
|
||||
expireType: null,
|
||||
callback: function() {
|
||||
secHistogram.add(NEVER_SHARE);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -489,9 +469,6 @@ GeolocationPermissionPrompt.prototype = {
|
|||
},
|
||||
|
||||
onBeforeShow() {
|
||||
let secHistogram = Services.telemetry.getHistogramById("SECURITY_UI");
|
||||
const SHOW_REQUEST = Ci.nsISecurityUITelemetry.WARNING_GEOLOCATION_REQUEST;
|
||||
secHistogram.add(SHOW_REQUEST);
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -4704,46 +4704,18 @@ var ErrorPageEventHandler = {
|
|||
// The event came from a button on a malware/phishing block page
|
||||
// First check whether it's malware, phishing or unwanted, so that we
|
||||
// can use the right strings/links
|
||||
let bucketName = "";
|
||||
let sendTelemetry = false;
|
||||
if (errorDoc.documentURI.includes("e=malwareBlocked")) {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_MALWARE_PAGE_";
|
||||
} else if (errorDoc.documentURI.includes("e=deceptiveBlocked")) {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_PHISHING_PAGE_";
|
||||
} else if (errorDoc.documentURI.includes("e=unwantedBlocked")) {
|
||||
sendTelemetry = true;
|
||||
bucketName = "WARNING_UNWANTED_PAGE_";
|
||||
}
|
||||
let nsISecTel = Ci.nsISecurityUITelemetry;
|
||||
let isIframe = (errorDoc.defaultView.parent === errorDoc.defaultView);
|
||||
bucketName += isIframe ? "TOP_" : "FRAME_";
|
||||
|
||||
let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
|
||||
|
||||
if (target == errorDoc.getElementById("getMeOutButton")) {
|
||||
if (sendTelemetry) {
|
||||
Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "GET_ME_OUT_OF_HERE"]);
|
||||
}
|
||||
errorDoc.location = "about:home";
|
||||
} else if (target == errorDoc.getElementById("reportButton")) {
|
||||
// We log even if malware/phishing info URL couldn't be found:
|
||||
// the measurement is for how many users clicked the WHY BLOCKED button
|
||||
if (sendTelemetry) {
|
||||
Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "WHY_BLOCKED"]);
|
||||
}
|
||||
|
||||
// This is the "Why is this site blocked" button. We redirect
|
||||
// to the generic page describing phishing/malware protection.
|
||||
let url = Services.urlFormatter.formatURLPref("app.support.baseURL");
|
||||
BrowserApp.selectedBrowser.loadURI(url + "phishing-malware");
|
||||
} else if (target == errorDoc.getElementById("ignoreWarningButton") &&
|
||||
Services.prefs.getBoolPref("browser.safebrowsing.allowOverride")) {
|
||||
if (sendTelemetry) {
|
||||
Telemetry.addData("SECURITY_UI", nsISecTel[bucketName + "IGNORE_WARNING"]);
|
||||
}
|
||||
|
||||
// Allow users to override and continue through to the site,
|
||||
let webNav = BrowserApp.selectedBrowser.docShell.QueryInterface(Ci.nsIWebNavigation);
|
||||
let location = BrowserApp.selectedBrowser.contentWindow.location;
|
||||
|
|
|
@ -12,8 +12,6 @@ var gCert;
|
|||
var gChecking;
|
||||
var gBroken;
|
||||
var gNeedReset;
|
||||
var gSecHistogram;
|
||||
var gNsISecTel;
|
||||
|
||||
Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
|
||||
|
||||
|
@ -49,10 +47,6 @@ function initExceptionDialog() {
|
|||
gDialog = document.documentElement;
|
||||
gBundleBrand = document.getElementById("brand_bundle");
|
||||
gPKIBundle = document.getElementById("pippki_bundle");
|
||||
gSecHistogram = Components.classes["@mozilla.org/base/telemetry;1"].
|
||||
getService(Components.interfaces.nsITelemetry).
|
||||
getHistogramById("SECURITY_UI");
|
||||
gNsISecTel = Components.interfaces.nsISecurityUITelemetry;
|
||||
|
||||
var brandName = gBundleBrand.getString("brandShortName");
|
||||
setText("warningText", gPKIBundle.getFormattedString("addExceptionBrandedWarning2", [brandName]));
|
||||
|
@ -190,7 +184,6 @@ function updateCertStatus() {
|
|||
var shortDesc3, longDesc3;
|
||||
var use2 = false;
|
||||
var use3 = false;
|
||||
let bucketId = gNsISecTel.WARNING_BAD_CERT_TOP_ADD_EXCEPTION_BASE;
|
||||
if (gCert) {
|
||||
if (gBroken) {
|
||||
var mms = "addExceptionDomainMismatchShort";
|
||||
|
@ -201,13 +194,11 @@ function updateCertStatus() {
|
|||
var utl = "addExceptionUnverifiedOrBadSignatureLong2";
|
||||
var use1 = false;
|
||||
if (gSSLStatus.isDomainMismatch) {
|
||||
bucketId += gNsISecTel.WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_DOMAIN;
|
||||
use1 = true;
|
||||
shortDesc = mms;
|
||||
longDesc = mml;
|
||||
}
|
||||
if (gSSLStatus.isNotValidAtThisTime) {
|
||||
bucketId += gNsISecTel.WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_TIME;
|
||||
if (!use1) {
|
||||
use1 = true;
|
||||
shortDesc = exs;
|
||||
|
@ -220,7 +211,6 @@ function updateCertStatus() {
|
|||
}
|
||||
}
|
||||
if (gSSLStatus.isUntrusted) {
|
||||
bucketId += gNsISecTel.WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_UNTRUSTED;
|
||||
if (!use1) {
|
||||
use1 = true;
|
||||
shortDesc = uts;
|
||||
|
@ -235,7 +225,6 @@ function updateCertStatus() {
|
|||
longDesc3 = utl;
|
||||
}
|
||||
}
|
||||
gSecHistogram.add(bucketId);
|
||||
|
||||
// In these cases, we do want to enable the "Add Exception" button
|
||||
gDialog.getButton("extra1").disabled = false;
|
||||
|
@ -307,7 +296,6 @@ function updateCertStatus() {
|
|||
* Handle user request to display certificate details
|
||||
*/
|
||||
function viewCertButtonClick() {
|
||||
gSecHistogram.add(gNsISecTel.WARNING_BAD_CERT_TOP_CLICK_VIEW_CERT);
|
||||
if (gCert) {
|
||||
viewCertHelper(this, gCert);
|
||||
}
|
||||
|
@ -324,27 +312,19 @@ function addException() {
|
|||
var overrideService = Components.classes["@mozilla.org/security/certoverride;1"]
|
||||
.getService(Components.interfaces.nsICertOverrideService);
|
||||
var flags = 0;
|
||||
let confirmBucketId = gNsISecTel.WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_BASE;
|
||||
if (gSSLStatus.isUntrusted) {
|
||||
flags |= overrideService.ERROR_UNTRUSTED;
|
||||
confirmBucketId += gNsISecTel.WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_UNTRUSTED;
|
||||
}
|
||||
if (gSSLStatus.isDomainMismatch) {
|
||||
flags |= overrideService.ERROR_MISMATCH;
|
||||
confirmBucketId += gNsISecTel.WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_DOMAIN;
|
||||
}
|
||||
if (gSSLStatus.isNotValidAtThisTime) {
|
||||
flags |= overrideService.ERROR_TIME;
|
||||
confirmBucketId += gNsISecTel.WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_TIME;
|
||||
}
|
||||
|
||||
var permanentCheckbox = document.getElementById("permanent");
|
||||
var shouldStorePermanently = permanentCheckbox.checked && !inPrivateBrowsingMode();
|
||||
if (!permanentCheckbox.checked) {
|
||||
gSecHistogram.add(gNsISecTel.WARNING_BAD_CERT_TOP_DONT_REMEMBER_EXCEPTION);
|
||||
}
|
||||
|
||||
gSecHistogram.add(confirmBucketId);
|
||||
var uri = getURI();
|
||||
overrideService.rememberValidityOverride(
|
||||
uri.asciiHost, uri.port,
|
||||
|
|
|
@ -32,7 +32,6 @@ XPIDL_SOURCES += [
|
|||
'nsIPKCS11Slot.idl',
|
||||
'nsIProtectedAuthThread.idl',
|
||||
'nsISecretDecoderRing.idl',
|
||||
'nsISecurityUITelemetry.idl',
|
||||
'nsISiteSecurityService.idl',
|
||||
'nsISSLStatus.idl',
|
||||
'nsISSLStatusProvider.idl',
|
||||
|
|
|
@ -1,150 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* 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/. */
|
||||
|
||||
#include "nsISupports.idl"
|
||||
|
||||
[scriptable, uuid(5d1acf82-223a-46fb-a8f3-a1b16e2ceb04)]
|
||||
|
||||
interface nsISecurityUITelemetry : nsISupports {
|
||||
|
||||
/*
|
||||
* Addon installation warnings
|
||||
*/
|
||||
|
||||
// Firefox prevented this site from asking you to install addon
|
||||
const uint32_t WARNING_ADDON_ASKING_PREVENTED = 1;
|
||||
// User clicks through and allows site to ask to install addons
|
||||
const uint32_t WARNING_ADDON_ASKING_PREVENTED_CLICK_THROUGH = 2;
|
||||
// Are you sure you want to install this addon? Only install addons you trust
|
||||
const uint32_t WARNING_CONFIRM_ADDON_INSTALL = 3;
|
||||
// User clicked she is sure after waiting 3secs
|
||||
const uint32_t WARNING_CONFIRM_ADDON_INSTALL_CLICK_THROUGH = 4;
|
||||
|
||||
|
||||
/*
|
||||
* modal dialogs/warnings
|
||||
*/
|
||||
|
||||
// removed WARNING_ENTERING_SECURE_SITE = 5;
|
||||
// removed WARNING_ENTERING_WEAK_SITE = 6;
|
||||
// removed WARNING_LEAVING_SECURE_SITE = 7;
|
||||
// removed WARNING_MIXED_CONTENT = 8;
|
||||
|
||||
// For confirmation dialogs, the clickthrough constant needs to be 1
|
||||
// more than the dialog constant so that
|
||||
// WARNING_CONFIRM_<X> + 1 == WARNING_CONFIRM_<X>_CLICK_THROUGH
|
||||
const uint32_t WARNING_CONFIRM_POST_TO_INSECURE_FROM_SECURE = 9;
|
||||
const uint32_t WARNING_CONFIRM_POST_TO_INSECURE_FROM_SECURE_CLICK_THROUGH = 10;
|
||||
// removed WARNING_CONFIRM_POST_TO_INSECURE_FROM_INSECURE = 11;
|
||||
// removed WARNING_CONFIRM_POST_TO_INSECURE_FROM_INSECURE_CLICK_THROUGH = 12;
|
||||
|
||||
/*
|
||||
* Phishing / Malware page warnings
|
||||
* deprecated: we use the _TOP and _FRAME versions below
|
||||
*/
|
||||
|
||||
const uint32_t WARNING_MALWARE_PAGE = 13;
|
||||
const uint32_t WARNING_MALWARE_PAGE_WHY_BLOCKED = 14;
|
||||
const uint32_t WARNING_MALWARE_PAGE_GET_ME_OUT_OF_HERE = 15;
|
||||
const uint32_t WARNING_MALWARE_PAGE_IGNORE_WARNING = 16;
|
||||
|
||||
const uint32_t WARNING_PHISHING_PAGE = 17;
|
||||
const uint32_t WARNING_PHISHING_PAGE_WHY_BLOCKED = 18;
|
||||
const uint32_t WARNING_PHISHING_PAGE_GET_ME_OUT_OF_HERE = 19;
|
||||
const uint32_t WARNING_PHISHING_PAGE_IGNORE_WARNING = 20;
|
||||
|
||||
/*
|
||||
* SSL Error dialogs
|
||||
* deprecated: we use the _TOP versions below
|
||||
*/
|
||||
|
||||
const uint32_t WARNING_BAD_CERT = 21;
|
||||
const uint32_t WARNING_BAD_CERT_STS = 22;
|
||||
const uint32_t WARNING_BAD_CERT_CLICK_ADD_EXCEPTION = 23;
|
||||
const uint32_t WARNING_BAD_CERT_CLICK_VIEW_CERT = 24;
|
||||
const uint32_t WARNING_BAD_CERT_DONT_REMEMBER_EXCEPTION = 25;
|
||||
const uint32_t WARNING_BAD_CERT_GET_ME_OUT_OF_HERE = 27;
|
||||
const uint32_t WARNING_BAD_CERT_UNDERSTAND_RISKS = 28;
|
||||
const uint32_t WARNING_BAD_CERT_TECHINICAL_DETAILS = 29;
|
||||
|
||||
/*
|
||||
* Note that if we add more possibilities in the warning dialogs,
|
||||
* it is a new experiment and we shouldn't reuse these buckets.
|
||||
*/
|
||||
const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_BASE = 30;
|
||||
const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
|
||||
const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_FLAG_DOMAIN = 2;
|
||||
const uint32_t WARNING_BAD_CERT_ADD_EXCEPTION_FLAG_TIME = 4;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_CONFIRM_ADD_EXCEPTION_BASE = 38;
|
||||
const uint32_t WARNING_BAD_CERT_CONFIRM_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
|
||||
const uint32_t WARNING_BAD_CERT_CONFIRM_ADD_EXCEPTION_FLAG_DOMAIN = 2;
|
||||
const uint32_t WARNING_BAD_CERT_CONFIRM_ADD_EXCEPTION_FLAG_TIME = 4;
|
||||
// This uses up buckets till 45
|
||||
|
||||
/*
|
||||
* Geolocation Popup Telemetry
|
||||
*/
|
||||
|
||||
const uint32_t WARNING_GEOLOCATION_REQUEST = 46;
|
||||
const uint32_t WARNING_GEOLOCATION_REQUEST_SHARE_LOCATION = 47;
|
||||
const uint32_t WARNING_GEOLOCATION_REQUEST_ALWAYS_SHARE = 48;
|
||||
const uint32_t WARNING_GEOLOCATION_REQUEST_NEVER_SHARE = 49;
|
||||
// It would be nice to measure the two cases of user clicking
|
||||
// "not now", and user closing the popup. This is currently not implemented.
|
||||
|
||||
const uint32_t WARNING_MALWARE_PAGE_TOP = 52;
|
||||
const uint32_t WARNING_MALWARE_PAGE_TOP_WHY_BLOCKED = 53;
|
||||
const uint32_t WARNING_MALWARE_PAGE_TOP_GET_ME_OUT_OF_HERE = 54;
|
||||
const uint32_t WARNING_MALWARE_PAGE_TOP_IGNORE_WARNING = 55;
|
||||
|
||||
const uint32_t WARNING_PHISHING_PAGE_TOP = 56;
|
||||
const uint32_t WARNING_PHISHING_PAGE_TOP_WHY_BLOCKED = 57;
|
||||
const uint32_t WARNING_PHISHING_PAGE_TOP_GET_ME_OUT_OF_HERE = 58;
|
||||
const uint32_t WARNING_PHISHING_PAGE_TOP_IGNORE_WARNING = 59;
|
||||
|
||||
const uint32_t WARNING_MALWARE_PAGE_FRAME = 60;
|
||||
const uint32_t WARNING_MALWARE_PAGE_FRAME_WHY_BLOCKED = 61;
|
||||
const uint32_t WARNING_MALWARE_PAGE_FRAME_GET_ME_OUT_OF_HERE = 62;
|
||||
const uint32_t WARNING_MALWARE_PAGE_FRAME_IGNORE_WARNING = 63;
|
||||
|
||||
const uint32_t WARNING_PHISHING_PAGE_FRAME = 64;
|
||||
const uint32_t WARNING_PHISHING_PAGE_FRAME_WHY_BLOCKED = 65;
|
||||
const uint32_t WARNING_PHISHING_PAGE_FRAME_GET_ME_OUT_OF_HERE = 66;
|
||||
const uint32_t WARNING_PHISHING_PAGE_FRAME_IGNORE_WARNING = 67;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_TOP = 68;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_STS = 69;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CLICK_ADD_EXCEPTION = 70;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CLICK_VIEW_CERT = 71;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_DONT_REMEMBER_EXCEPTION = 72;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_GET_ME_OUT_OF_HERE = 73;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_UNDERSTAND_RISKS = 74;
|
||||
// removed WARNING_BAD_CERT_TOP_TECHNICAL_DETAILS = 75;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_TOP_ADD_EXCEPTION_BASE = 76;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_DOMAIN = 2;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_ADD_EXCEPTION_FLAG_TIME = 4;
|
||||
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_BASE = 84;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_UNTRUSTED = 1;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_DOMAIN = 2;
|
||||
const uint32_t WARNING_BAD_CERT_TOP_CONFIRM_ADD_EXCEPTION_FLAG_TIME = 4;
|
||||
|
||||
// Another Safe Browsing list (like malware & phishing above)
|
||||
const uint32_t WARNING_UNWANTED_PAGE_TOP = 92;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_TOP_WHY_BLOCKED = 93;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_TOP_GET_ME_OUT_OF_HERE = 94;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_TOP_IGNORE_WARNING = 95;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_FRAME = 96;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_FRAME_WHY_BLOCKED = 97;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_FRAME_GET_ME_OUT_OF_HERE = 98;
|
||||
const uint32_t WARNING_UNWANTED_PAGE_FRAME_IGNORE_WARNING = 99;
|
||||
|
||||
// This uses up buckets till 99 (including)
|
||||
// We only have buckets up to 100.
|
||||
};
|
|
@ -172,10 +172,6 @@ Installer.prototype = {
|
|||
args.wrappedJSObject = args;
|
||||
|
||||
try {
|
||||
Cc["@mozilla.org/base/telemetry;1"].
|
||||
getService(Ci.nsITelemetry).
|
||||
getHistogramById("SECURITY_UI").
|
||||
add(Ci.nsISecurityUITelemetry.WARNING_CONFIRM_ADDON_INSTALL);
|
||||
let parentWindow = null;
|
||||
if (this.browser) {
|
||||
parentWindow = this.browser.ownerDocument.defaultView;
|
||||
|
|
|
@ -179,10 +179,6 @@ XPInstallConfirm.init = function()
|
|||
|
||||
XPInstallConfirm.onOK = function()
|
||||
{
|
||||
Components.classes["@mozilla.org/base/telemetry;1"].
|
||||
getService(Components.interfaces.nsITelemetry).
|
||||
getHistogramById("SECURITY_UI").
|
||||
add(Components.interfaces.nsISecurityUITelemetry.WARNING_CONFIRM_ADDON_INSTALL_CLICK_THROUGH);
|
||||
// Perform the install or cancel after the window has unloaded
|
||||
XPInstallConfirm._installOK = true;
|
||||
return true;
|
||||
|
|
Loading…
Reference in New Issue