Bug 607926 - Feedback notification should be be close if there is no prefs change [r=mfinkle]

mobile/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.js

@@ -36,6 +36,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 var Feedback = {
+  _prefs: [],
+
   init: function(aEvent) {
     let appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
     document.getElementById("feedback-about").setAttribute("desc", appInfo.version);
@@ -43,6 +45,16 @@ var Feedback = {
     // A simple frame script to fill in the referrer page
     messageManager.loadFrameScript("data:,addMessageListener('Feedback:InitPage', function(m) { content.document.getElementById('id_url').value = m.json.referrer; });", true);
 
+    let feedbackPrefs = document.getElementById("feedback-tools").childNodes;
+    for (let i = 0; i < feedbackPrefs.length; i++) {
+      let pref = feedbackPrefs[i].getAttribute("pref");
+      if (!pref)
+        continue;
+
+      let value = Services.prefs.getPrefType(pref) == Ci.nsIPrefBranch.PREF_INVALID ? false : Services.prefs.getBoolPref(pref);
+      Feedback._prefs.push({ "name": pref, "value": value });
+    }
+
     // Delay the widget initialization during startup.
     window.addEventListener("UIReadyDelayed", function(aEvent) {
       window.removeEventListener(aEvent.type, arguments.callee, false);
@@ -74,12 +86,22 @@ var Feedback = {
 
       let value = "restart-app";
       let notification = msg.getNotificationWithValue(value);
-      if (notification)
+      if (notification) {
+        // Check if the prefs are back to the initial state dismiss the restart
+        // notification because if does not make sense anymore
+        for each (let pref in this._prefs) {
+          let value = Services.prefs.getPrefType(pref.name) == Ci.nsIPrefBranch.PREF_INVALID ? false : Services.prefs.getBoolPref(pref.name);
+          if (value != pref.value)
             return;
+        }
+
+        notification.close();
+        return;
+      }
   
       let restartCallback = function(aNotification, aDescription) {
         // Notify all windows that an application quit has been requested
-        var cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
+        let cancelQuit = Cc["@mozilla.org/supports-PRBool;1"].createInstance(Ci.nsISupportsPRBool);
         Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
   
         // If nothing aborted, quit the app

mobile/themes/core/notification.css

@@ -12,6 +12,10 @@ notification .messageCloseButton {
   -moz-box-align: start;
 }
 
+notification .messageCloseButton:-moz-focusring {
+  outline: 0 !important;
+}
+
 notification .messageCloseButton:hover:active {
   list-style-image: url("chrome://browser/skin/images/close-active-hdpi.png");
 }