Bug 1584160 - Restore persisted state of all toolbars possibly affected by an overlay. r=pmorris

common/src/Overlays.jsm

@@ -351,8 +351,9 @@ class Overlays {
           target = palette;
         }
 
+        this._toolbarsToResolve.push(...box.querySelectorAll("toolbar"));
         this._toolbarsToResolve.push(
-          ...box.querySelectorAll('toolbar:not([type="menubar"])')
+          ...this.document.querySelectorAll(`toolbar[toolboxid="${box.id}"]`)
         );
       } else if (!target) {
         oconsole.debug(
@@ -386,6 +387,12 @@ class Overlays {
       }
     }
 
+    if (node.localName == "toolbar") {
+      this._toolbarsToResolve.push(node);
+    } else {
+      this._toolbarsToResolve.push(...node.querySelectorAll("toolbar"));
+    }
+
     let wasInserted = false;
     let pos = node.getAttribute("insertafter");
     let after = true;