Bug 1314213 - Pass dismiss from PermissionPromptPrototype to PopupNotifications; r=mconley
authorChun-Min Chang <chun.m.chang@gmail.com>
Tue, 01 Nov 2016 13:56:32 +0800
changeset 347167 19605fd7b009b57f014b9038b6de57c49551463d
parent 347166 3bee4763126ec434e91b70b3883c19e1b33272ce
child 347168 e494b786169940e6495ba006d9ab43f3efec03d3
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1314213
milestone52.0a1
Bug 1314213 - Pass dismiss from PermissionPromptPrototype to PopupNotifications; r=mconley MozReview-Commit-ID: 8WxlgMSTn0q
browser/modules/PermissionUI.jsm
--- a/browser/modules/PermissionUI.jsm
+++ b/browser/modules/PermissionUI.jsm
@@ -316,16 +316,19 @@ this.PermissionPromptPrototype = {
                 promptAction.action == Ci.nsIPermissionManager.ALLOW_ACTION) {
               this.allow();
             } else {
               this.cancel();
             }
           }
         },
       };
+      if (promptAction.dismiss) {
+        action.dismiss = promptAction.dismiss
+      }
 
       popupNotificationActions.push(action);
     }
 
     let mainAction = popupNotificationActions.length ?
                      popupNotificationActions[0] : null;
     let secondaryActions = popupNotificationActions.splice(1);