Backed out changeset 5a7fca706daa (bug 1329942) for failing browser-chrome browser_bug553455.js. r=backout

browser/base/content/browser.xul

@@ -26,7 +26,6 @@
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:svg="http://www.w3.org/2000/svg"
         xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
         title="&mainWindow.title;"

browser/base/content/popup-notifications.inc

@@ -74,6 +74,7 @@
 
     <popupnotification id="addon-webext-permissions-notification" hidden="true">
       <popupnotificationcontent orient="vertical">
+        <description id="addon-webext-perm-header" class="addon-webext-perm-header"/>
         <description id="addon-webext-perm-text" class="addon-webext-perm-text"/>
         <label id="addon-webext-perm-intro" class="addon-webext-perm-text"/>
         <html:ul id="addon-webext-perm-list" class="addon-webext-perm-list"/>

browser/base/content/test/popupNotifications/browser_popupNotification_checkbox.js

@@ -160,22 +160,6 @@ var tests = [
       gNotification.remove();
     }
   },
-  // Test no checkbox hides warning label
-  { id: "no_checkbox",
-    run() {
-      this.notifyObj = new BasicNotification(this.id);
-      this.notifyObj.options.checkbox = null;
-      gNotification = showNotification(this.notifyObj);
-    },
-    onShown(popup) {
-      checkPopup(popup, this.notifyObj);
-      let notification = popup.childNodes[0];
-      checkCheckbox(notification.checkbox, "", false, true);
-      checkMainAction(notification);
-      triggerMainCommand(popup);
-    },
-    onHidden() { }
-  },
 ];
 
 // Test checkbox disabling the main action in different combinations

browser/modules/ExtensionsUI.jsm

@@ -327,11 +327,10 @@ this.ExtensionsUI = {
 
   showPermissionsPrompt(browser, strings, icon, histkey) {
     function eventCallback(topic) {
-      let doc = this.browser.ownerDocument;
-      if (topic == "shown") {
-        doc.getElementById("addon-webext-permissions-notification")
-           .description.innerHTML = strings.header;
-      } else if (topic == "showing") {
+      if (topic == "showing") {
+        let doc = this.browser.ownerDocument;
+        doc.getElementById("addon-webext-perm-header").innerHTML = strings.header;
+
         let textEl = doc.getElementById("addon-webext-perm-text");
         textEl.innerHTML = strings.text;
         textEl.hidden = !strings.text;
@@ -384,12 +383,7 @@ this.ExtensionsUI = {
         },
       ];
 
-      // Get the text value of strings.header to pre-populate the header. This will get
-      // overwritten with the HTML version later.
-      let escapeHeader = browser.ownerDocument.createElement("div");
-      escapeHeader.innerHTML = strings.header;
-      win.PopupNotifications.show(browser, "addon-webext-permissions",
-                                  escapeHeader.textContent,
+      win.PopupNotifications.show(browser, "addon-webext-permissions", "",
                                   "addons-notification-icon",
                                   action, secondaryActions, popupOptions);
     });

browser/themes/linux/browser.css

@@ -798,18 +798,8 @@ menuitem.bookmark-item {
   font-weight: bold;
 }
 
-html|*.addon-webext-perm-list {
-  margin-block-end: 0;
-  padding-inline-start: 10px;
-}
-
-.addon-webext-perm-text {
-  margin-inline-start: 0;
-}
-
-.popup-notification-description[popupid="addon-webext-permissions"] {
-  margin: 0;
-  padding: 0;
+.addon-webext-perm-header {
+  font-size: 1.3em;
 }
 
 .addon-webext-name {

browser/themes/osx/browser.css

@@ -3064,18 +3064,8 @@ menulist.translate-infobar-element > .menulist-dropmarker {
   font-weight: bold;
 }
 
-html|*.addon-webext-perm-list {
-  margin-block-end: 0;
-  padding-inline-start: 10px;
-}
-
-.addon-webext-perm-text {
-  margin-inline-start: 0;
-}
-
-.popup-notification-description[popupid="addon-webext-permissions"] {
-  margin: 0;
-  padding: 0;
+.addon-webext-perm-header {
+  font-size: 1.3em;
 }
 
 .addon-webext-name {

browser/themes/windows/browser.css

@@ -2094,18 +2094,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   font-weight: bold;
 }
 
-html|*.addon-webext-perm-list {
-  margin-block-end: 0;
-  padding-inline-start: 10px;
-}
-
-.addon-webext-perm-text {
-  margin-inline-start: 0;
-}
-
-.popup-notification-description[popupid="addon-webext-permissions"] {
-  margin: 0;
-  padding: 0;
+.addon-webext-perm-header {
+  font-size: 1.3em;
 }
 
 .addon-webext-name {

toolkit/content/widgets/notification.xml

@@ -493,8 +493,7 @@
               <xul:label class="popup-notification-origin header"
                          xbl:inherits="value=origin,tooltiptext=origin"
                          crop="center"/>
-              <xul:description anonid="description"
-                               class="popup-notification-description"
+              <xul:description class="popup-notification-description"
                                xbl:inherits="xbl:text=label,popupid"/>
             </xul:vbox>
             <xul:toolbarbutton anonid="closebutton"
@@ -543,9 +542,6 @@
       <field name="closebutton" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "closebutton");
       </field>
-      <field name="description">
-        document.getAnonymousElementByAttribute(this, "anonid", "description");
-      </field>
       <field name="button" readonly="true">
         document.getAnonymousElementByAttribute(this, "anonid", "button");
       </field>

toolkit/modules/PopupNotifications.jsm

@@ -848,7 +848,6 @@ PopupNotifications.prototype = {
         }
       } else {
         popupnotification.setAttribute("checkboxhidden", "true");
-        this._setNotificationUIState(popupnotification);
       }
 
       this.panel.appendChild(popupnotification);