From c85bd89f91ed5810ffa938f4c56b02834fe15547 Mon Sep 17 00:00:00 2001
From: Margaret Leibovic <margaret.leibovic@gmail.com>
Date: Tue, 18 Jan 2011 14:57:40 -0800
Subject: [PATCH] Bug 617553 - Doorhanger for add-on installation failures
 inside the AOM has no parent with chrome hidden [r=gavin, a=blocking]

---
 browser/base/content/browser.css              |  3 ++
 browser/base/content/browser.xul              |  1 +
 .../content/test/browser_popupNotification.js | 31 ++++++++++++++++++-
 .../themes/gnomestripe/browser/browser.css    |  4 +++
 browser/themes/pinstripe/browser/browser.css  |  4 +++
 browser/themes/winstripe/browser/browser.css  |  4 +++
 toolkit/content/PopupNotifications.jsm        |  8 +++++
 7 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 7aca53daa32..fe0bf90b80b 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -480,6 +480,9 @@ window[chromehidden~="toolbar"] toolbar:not(.toolbar-primary):not(.chromeclass-m
   -moz-user-focus: normal;
 }
 
+/* We use the iconBox as the notification anchor when a popup notification is
+   created with a null anchorID, so in that case use a default anchor icon. */
+#notification-popup-box[anchorid="notification-popup-box"] > #default-notification-icon,
 #notification-popup-box[anchorid="geo-notification-icon"] > #geo-notification-icon,
 #notification-popup-box[anchorid="indexedDB-notification-icon"] > #indexedDB-notification-icon,
 #notification-popup-box[anchorid="addons-notification-icon"] > #addons-notification-icon,
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 3ee5a0d1d1b..5e4da397295 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -543,6 +543,7 @@
                  onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
                  onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
           <box id="notification-popup-box" hidden="true" align="center">
+            <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
             <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
             <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
             <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
diff --git a/browser/base/content/test/browser_popupNotification.js b/browser/base/content/test/browser_popupNotification.js
index 31a27b8b9bb..65923010f26 100644
--- a/browser/base/content/test/browser_popupNotification.js
+++ b/browser/base/content/test/browser_popupNotification.js
@@ -22,6 +22,7 @@
  *   Gavin Sharp <gavin@gavinsharp.com>
  *   Sylvain Pasche <sylvain.pasche@gmail.com>
  *   Drew Willcoxon <adw@mozilla.com>
+ *   Margaret Leibovic <margaret.leibovic@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -583,6 +584,32 @@ var tests = [
       ok(this.notifyObj.removedCallbackTriggered, "removed callback triggered");
     }
   },
+  // Test notification when chrome is hidden
+  { // Test #18
+    run: function () {
+      this.oldSelectedTab = gBrowser.selectedTab;
+      gBrowser.selectedTab = gBrowser.addTab("about:blank");
+
+      let self = this;
+      loadURI("about:addons", function() {
+        self.notifyObj = new basicNotification();
+        self.notification = showNotification(self.notifyObj);
+      });
+    },
+    onShown: function (popup) {
+      checkPopup(popup, this.notifyObj);
+      is(popup.anchorNode.className, "tabbrowser-tab", "notification anchored to tab");
+      dismissNotification(popup);
+    },
+    onHidden: function (popup) {
+      ok(this.notifyObj.dismissalCallbackTriggered, "dismissal callback triggered");
+      this.notification.remove();
+      ok(this.notifyObj.removedCallbackTriggered, "removed callback triggered");
+
+      gBrowser.removeTab(gBrowser.selectedTab);
+      gBrowser.selectedTab = this.oldSelectedTab;
+    }
+  },
 ];
 
 function showNotification(notifyObj) {
@@ -604,8 +631,10 @@ function checkPopup(popup, notificationObj) {
   is(notifications.length, 1, "only one notification displayed");
   let notification = notifications[0];
   let icon = document.getAnonymousElementByAttribute(notification, "class", "popup-notification-icon");
-  if (notificationObj.id == "geolocation")
+  if (notificationObj.id == "geolocation") {
     isnot(icon.boxObject.width, 0, "icon for geo displayed");
+    is(popup.anchorNode.className, "notification-anchor-icon", "notification anchored to icon");
+  }
   is(notification.getAttribute("label"), notificationObj.message, "message matches");
   is(notification.id, notificationObj.id + "-notification", "id matches");
   if (notificationObj.mainAction) {
diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
index 1771bf559d6..35cf92c0b6a 100644
--- a/browser/themes/gnomestripe/browser/browser.css
+++ b/browser/themes/gnomestripe/browser/browser.css
@@ -1201,6 +1201,10 @@ toolbar[iconsize="small"] #feed-button {
   outline: 1px dotted -moz-DialogText;
 }
 
+#default-notification-icon {
+  list-style-image: url(chrome://global/skin/icons/information-16.png);
+}
+
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css
index 1bf741d4f3f..cf558c9689b 100644
--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -2067,6 +2067,10 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
               0 0 3px 2px -moz-mac-focusring;
 }
 
+#default-notification-icon {
+  list-style-image: url(chrome://global/skin/icons/information-16.png);
+}
+
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css
index 30e05901d9d..a0e1fd35679 100644
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -2023,6 +2023,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   outline-offset: -3px;
 }
 
+#default-notification-icon {
+  list-style-image: url(chrome://global/skin/icons/information-16.png);
+}
+
 #geo-notification-icon {
   list-style-image: url(chrome://browser/skin/Geolocation-16.png);
 }
diff --git a/toolkit/content/PopupNotifications.jsm b/toolkit/content/PopupNotifications.jsm
index 9804ff32299..477ba689bf0 100644
--- a/toolkit/content/PopupNotifications.jsm
+++ b/toolkit/content/PopupNotifications.jsm
@@ -20,6 +20,7 @@
  *
  * Contributor(s):
  *   Gavin Sharp <gavin@gavinsharp.com> (Original Author)
+ *   Margaret Leibovic <margaret.leibovic@gmail.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -418,6 +419,13 @@ PopupNotifications.prototype = {
     // safe to call even if the panel is already hidden.)
     this._hidePanel();
 
+    // If the anchor element is hidden, use the tab as the anchor. We only ever
+    // show notifications for the current browser, so we can just use the
+    // current tab.
+    let bo = anchorElement.boxObject;
+    if (bo.height == 0 && bo.width == 0)
+      anchorElement = this.tabbrowser.selectedTab;
+
     this._currentAnchorElement = anchorElement;
 
     this.panel.openPopup(anchorElement, "bottomcenter topleft");