Bug 1437486 - don't reset the forget button duration when the popup is visible, r=johannh

MozReview-Commit-ID: 6TWGSSuZxsa

--HG--
extra : rebase_source : 21a5749e3dc32edebe159ac3a5ce53cfca63999c

browser/components/customizableui/CustomizableWidgets.jsm

@@ -902,7 +902,6 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
       let doc = aEvent.target.ownerDocument;
       let group = doc.getElementById("PanelUI-panic-timeSpan");
       BrowserUITelemetry.countPanicEvent(group.selectedItem.id);
-      group.selectedItem = doc.getElementById("PanelUI-panic-5min");
       let itemsToClear = [
         "cookies", "history", "openWindows", "formdata", "sessions", "cache", "downloads"
       ];
@@ -934,6 +933,9 @@ if (Services.prefs.getBoolPref("privacy.panicButton.enabled")) {
     },
     onViewShowing(aEvent) {
       let forgetButton = aEvent.target.querySelector("#PanelUI-panic-view-button");
+      let doc = aEvent.target.ownerDocument;
+      let group = doc.getElementById("PanelUI-panic-timeSpan");
+      group.selectedItem = doc.getElementById("PanelUI-panic-5min");
       forgetButton.addEventListener("command", this);
     },
     onViewHiding(aEvent) {