Backed out changeset a64ec906ba99 (bug 1695084) for causing browser-chrome failures in browser_PermissionUI_prompts. DONTBUILD CLOSED TREE
authorsmolnar <smolnar@mozilla.com>
Thu, 04 Mar 2021 08:57:01 +0200
changeset 569613 74781d5a8b3d4adacc054ee943a2ab0dc5035f30
parent 569612 a64ec906ba99971b276ab3335c0dbdc49862509f
child 569614 19f9592d23c1e3ffc3766fa03131818e16b93ade
push id137716
push usersmolnar@mozilla.com
push dateThu, 04 Mar 2021 07:02:56 +0000
treeherderautoland@74781d5a8b3d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1695084
milestone88.0a1
backs outa64ec906ba99971b276ab3335c0dbdc49862509f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset a64ec906ba99 (bug 1695084) for causing browser-chrome failures in browser_PermissionUI_prompts. DONTBUILD CLOSED TREE
browser/locales/en-US/chrome/browser/browser.properties
browser/modules/PermissionUI.jsm
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -628,20 +628,21 @@ xr.dontAllow=Don’t Allow
 xr.dontAllow.accesskey=n
 xr.shareWithSite3=Will you allow %S to access virtual reality devices? This may expose sensitive information.
 xr.shareWithFile3=Will you allow this local file to access virtual reality devices? This may expose sensitive information.
 xr.remember=Remember this decision
 
 # Persistent storage UI
 persistentStorage.allow=Allow
 persistentStorage.allow.accesskey=A
-persistentStorage.block.label=Block
-persistentStorage.block.accesskey=B
-persistentStorage.allowWithSite2=Allow %S to store data in persistent storage?
-persistentStorage.remember=Remember this decision
+persistentStorage.neverAllow.label=Never Allow
+persistentStorage.neverAllow.accesskey=N
+persistentStorage.notNow.label=Not Now
+persistentStorage.notNow.accesskey=w
+persistentStorage.allowWithSite=Will you allow %S to store data in persistent storage?
 
 webNotifications.allow=Allow Notifications
 webNotifications.allow.accesskey=A
 webNotifications.notNow=Not Now
 webNotifications.notNow.accesskey=n
 webNotifications.never=Never Allow
 webNotifications.never.accesskey=v
 webNotifications.receiveFromSite2=Will you allow %S to send notifications?
--- a/browser/modules/PermissionUI.jsm
+++ b/browser/modules/PermissionUI.jsm
@@ -1078,69 +1078,66 @@ PersistentStoragePermissionPrompt.protot
   get permissionKey() {
     return "persistent-storage";
   },
 
   get popupOptions() {
     let learnMoreURL =
       Services.urlFormatter.formatURLPref("app.support.baseURL") +
       "storage-permissions";
-    let options = {
+    return {
       learnMoreURL,
       displayURI: false,
       name: this.getPrincipalName(),
-      checkbox: {
-        show:
-          !this.principal.schemeIs("file") &&
-          !PrivateBrowsingUtils.isWindowPrivate(this.browser.ownerGlobal),
-      },
     };
-
-    if (options.checkbox.show) {
-      options.checkbox.label = gBrowserBundle.GetStringFromName(
-        "persistentStorage.remember"
-      );
-    }
-
-    return options;
   },
 
   get notificationID() {
     return "persistent-storage";
   },
 
   get anchorID() {
     return "persistent-storage-notification-icon";
   },
 
   get message() {
     return gBrowserBundle.formatStringFromName(
-      "persistentStorage.allowWithSite2",
+      "persistentStorage.allowWithSite",
       ["<>"]
     );
   },
 
   get promptActions() {
     return [
       {
         label: gBrowserBundle.GetStringFromName("persistentStorage.allow"),
         accessKey: gBrowserBundle.GetStringFromName(
           "persistentStorage.allow.accesskey"
         ),
         action: Ci.nsIPermissionManager.ALLOW_ACTION,
         scope: SitePermissions.SCOPE_PERSISTENT,
       },
       {
         label: gBrowserBundle.GetStringFromName(
-          "persistentStorage.block.label"
+          "persistentStorage.notNow.label"
         ),
         accessKey: gBrowserBundle.GetStringFromName(
-          "persistentStorage.block.accesskey"
+          "persistentStorage.notNow.accesskey"
+        ),
+        action: Ci.nsIPermissionManager.DENY_ACTION,
+      },
+      {
+        label: gBrowserBundle.GetStringFromName(
+          "persistentStorage.neverAllow.label"
+        ),
+        accessKey: gBrowserBundle.GetStringFromName(
+          "persistentStorage.neverAllow.accesskey"
         ),
         action: SitePermissions.BLOCK,
+        scope: SitePermissions.SCOPE_PERSISTENT,
       },
     ];
   },
 };
 
 PermissionUI.PersistentStoragePermissionPrompt = PersistentStoragePermissionPrompt;
 
 /**