autoland: changeset 410666:a6fba6948018606931d31509773c40f83d9c7396

author	Tom Ritter <tom@mozilla.com>
	Mon, 26 Mar 2018 23:27:39 -0500
changeset 410666	a6fba6948018606931d31509773c40f83d9c7396
parent 410665	9ac9d64f983563909721836f971048d13bf3f6af
child 410667	0473a11b473458cb9b90002f366f1664ea4f23e9
push id	61932
push user	ryanvm@gmail.com
push date	Thu, 29 Mar 2018 19:16:14 +0000
treeherder	autoland@a6fba6948018 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	johannh
bugs	1397757
milestone	61.0a1
first release with	nightly linux32 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly linux64 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly mac dcd10220d55a / 61.0a1 / 20180329222832 / files nightly win32 dcd10220d55a / 61.0a1 / 20180329222832 / files nightly win64 dcd10220d55a / 61.0a1 / 20180329222832 / files
last release without	nightly linux32 8c71359d60e2 / 61.0a1 / 20180329100042 / files nightly linux64 8c71359d60e2 / 61.0a1 / 20180329100042 / files nightly mac 8c71359d60e2 / 61.0a1 / 20180329100042 / files nightly win32 8c71359d60e2 / 61.0a1 / 20180329100042 / files nightly win64 8c71359d60e2 / 61.0a1 / 20180329100042 / files

--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -6777,16 +6777,17 @@ var CanvasPermissionPromptHelper = {
     if (checkbox.show) {
       checkbox.checked = true;
       checkbox.label = gBrowserBundle.GetStringFromName("canvas.remember");
     }
 
     let options = {
       checkbox,
       name: uri.asciiHost,
+      learnMoreURL: Services.urlFormatter.formatURLPref("app.support.baseURL") + "fingerprint-permission",
     };
     PopupNotifications.show(browser, aTopic, message, this._notificationIcon,
                             mainAction, secondaryActions, options);
   }
 };
 
 var WebAuthnPromptHelper = {
   _icon: "webauthn-notification-icon",