Back out bug 882960 (a462ae7a8657) for mochitest-browser failures.
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 14 Jun 2013 17:38:57 +0200
changeset 164495 833523565041329100278d48faff3c5f307c77fb
parent 164494 0384f4c209f91cac4982ea16cac619d224a383c2
child 164496 cd6b6424d334e7f3aa9e5043024728e6490e6797
push id4703
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 20:24:19 +0000
treeherdermozilla-aurora@20af7fbd96c1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs882960
milestone24.0a1
Back out bug 882960 (a462ae7a8657) for mochitest-browser failures.
browser/components/customizableui/src/CustomizableWidgets.jsm
--- a/browser/components/customizableui/src/CustomizableWidgets.jsm
+++ b/browser/components/customizableui/src/CustomizableWidgets.jsm
@@ -186,16 +186,17 @@ const CustomizableWidgets = [{
                 aEvent.target.ownerDocument.defaultView;
       if (win && typeof win.openPreferences == "function") {
         win.openPreferences();
       }
     }
   }, {
     id: "zoom-controls",
     type: "custom",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
     onBuild: function(aDocument) {
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
       let noautoclose = inPanel ? "true" : null;
       let flex = inPanel ? "1" : null;
       let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
       let buttons = [{
@@ -220,17 +221,16 @@ const CustomizableWidgets = [{
         flex: flex,
         class: cls,
         label: true,
         tooltiptext: true
       }];
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
       node.setAttribute("id", "zoom-controls");
-      node.setAttribute("removable", "true");
       node.setAttribute("title", CustomizableUI.getLocalizedProperty(this, "tooltiptext"));
       if (inPanel)
         node.setAttribute("flex", "1");
       node.classList.add("chromeclass-toolbar-additional");
 
       buttons.forEach(function(aButton) {
         let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
         setAttributes(btnNode, aButton);
@@ -312,16 +312,17 @@ const CustomizableWidgets = [{
       };
       CustomizableUI.addListener(listener);
 
       return node;
     }
   }, {
     id: "edit-controls",
     type: "custom",
+    removable: true,
     defaultArea: CustomizableUI.AREA_PANEL,
     allowedAreas: [CustomizableUI.AREA_PANEL, CustomizableUI.AREA_NAVBAR],
     onBuild: function(aDocument) {
       let inPanel = (this.currentArea == CustomizableUI.AREA_PANEL);
       let flex = inPanel ? "1" : null;
       let cls = inPanel ? "panel-combined-button" : "toolbarbutton-1";
       let buttons = [{
         id: "cut-button",
@@ -343,17 +344,16 @@ const CustomizableWidgets = [{
         flex: flex,
         class: cls,
         label: true,
         tooltiptext: true
       }];
 
       let node = aDocument.createElementNS(kNSXUL, "toolbaritem");
       node.setAttribute("id", "edit-controls");
-      node.setAttribute("removable", "true");
       node.setAttribute("title", CustomizableUI.getLocalizedProperty(this, "tooltiptext"));
       if (inPanel)
         node.setAttribute("flex", "1");
       node.classList.add("chromeclass-toolbar-additional");
 
       buttons.forEach(function(aButton) {
         let btnNode = aDocument.createElementNS(kNSXUL, "toolbarbutton");
         setAttributes(btnNode, aButton);