Bug 1037017 - Remove cui-areatype from removable=false widgets. r=gijs

browser/base/content/browser.xul

@@ -565,8 +565,7 @@
 #endif
 #endif
              context="toolbar-context-menu">
-      <toolbaritem id="menubar-items" align="center"
-                   cui-areatype="toolbar">
+      <toolbaritem id="menubar-items" align="center">
 # The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
 # hiddenWindow.xul.
 #include browser-menubar.inc
@@ -603,7 +602,6 @@
             flex="1"
             setfocus="false"
             tooltip="tabbrowser-tab-tooltip"
-            cui-areatype="toolbar"
             stopwatchid="FX_TAB_CLICK_MS">
         <tab class="tabbrowser-tab" selected="true" fadein="true"/>
       </tabs>
@@ -688,12 +686,10 @@
       <hbox id="nav-bar-customization-target" flex="1">
         <toolbaritem id="urlbar-container" flex="400" persist="width"
                      title="&locationItem.title;" removable="false"
-                     cui-areatype="toolbar"
                      class="chromeclass-location" overflows="false">
           <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                          label="&backCmd.label;"
                          command="Browser:BackOrBackDuplicate"
-                         cui-areatype="toolbar"
                          onclick="checkForMiddleClick(this, event);"
                          tooltip="back-button-tooltip"
                          context="backForwardMenu"/>
@@ -701,7 +697,6 @@
             <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                            label="&forwardCmd.label;"
                            command="Browser:ForwardOrForwardDuplicate"
-                           cui-areatype="toolbar"
                            onclick="checkForMiddleClick(this, event);"
                            tooltip="forward-button-tooltip"
                            context="backForwardMenu"/>
@@ -804,7 +799,6 @@
                        orient="horizontal"
                        label="&webrtcIndicatorButton.label;"
                        tooltiptext="&webrtcIndicatorButton.tooltip;"
-                       cui-areatype="toolbar"
                        overflows="false">
           <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
                      onpopuphiding="WebrtcIndicator.clearPopup(this);"
@@ -823,8 +817,7 @@
                        removable="true"
                        tooltiptext="&loopCallButton.tooltip;"
                        oncommand="LoopUI.openCallPanel(event);"
-                       cui-areatype="toolbar"
-                       >
+                       cui-areatype="toolbar">
         </toolbarbutton>
 #endif
 
@@ -970,17 +963,14 @@
 
       <toolbarbutton id="nav-bar-overflow-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
-                     cui-areatype="toolbar"
                      skipintoolbarset="true"
                      tooltiptext="&navbarOverflow.label;"/>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
-                   cui-areatype="toolbar"
                    removable="false">
         <toolbarbutton id="PanelUI-menu-button"
                        class="toolbarbutton-1"
-                       cui-areatype="toolbar"
                        consumeanchor="PanelUI-button"
                        label="&brandShortName;"
                        tooltiptext="&appmenu.tooltip;"/>
@@ -997,7 +987,6 @@
 # Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
 # to exit fullscreen and want it to behave like other toolbar buttons.
                        class="toolbarbutton-1"
-                       cui-areatype="toolbar"
 #endif
                        tooltiptext="&fullScreenRestore.tooltip;"
                        oncommand="BrowserFullScreen();"/>

browser/components/customizableui/src/CustomizableUI.jsm

@@ -621,7 +621,6 @@ let CustomizableUIInternal = {
                 container.removeChild(node);
               }
             } else {
-              this.setLocationAttributes(currentNode, aArea);
               node.setAttribute("removable", false);
               LOG("Adding non-removable widget to placements of " + aArea + ": " +
                   node.id);

browser/components/customizableui/src/CustomizableWidgets.jsm

@@ -70,7 +70,6 @@ function updateCombinedWidgetStyle(aNode, aArea, aModifyCloseMenu) {
   if (aModifyCloseMenu) {
     attrs.closemenu = inPanel ? "none" : null;
   }
-  attrs["cui-areatype"] = aArea ? CustomizableUI.getAreaType(aArea) : null;
   for (let i = 0, l = aNode.childNodes.length; i < l; ++i) {
     if (aNode.childNodes[i].localName == "separator")
       continue;

browser/themes/osx/browser.css

@@ -1087,11 +1087,11 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-ic
     -moz-image-region: rect(36px, 1152px, 72px, 1116px);
   }
 
-  #webrtc-status-button[cui-areatype="toolbar"] {
+  #webrtc-status-button {
     -moz-image-region: rect(0, 1188px, 36px, 1152px);
   }
 
-  #webrtc-status-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+  #webrtc-status-button:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(36px, 1188px, 72px, 1152px);
   }
 
@@ -1340,7 +1340,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button {
 }
 
 /* Help 16px icons fit: */
-.toolbarbutton-1[cui-areatype="toolbar"]:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon {
+toolbar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon {
   margin: 2px;
 }