Bug 1418494 - Flatten menucaption-inmenulist into menucaption;r=mconley

The only time menucaptions are created are for optgroups, and they
always get instantiated as menucaption-inmenulist. Flatten the
inheritance here to get rid of a binding.

MozReview-Commit-ID: KWzor0QDdma

--HG--
extra : rebase_source : a87ea48a4c6815ec6bdb53925283a9c1ed89f5a2

toolkit/content/widgets/menu.xml

@@ -187,12 +187,6 @@
     </content>
   </binding>
 
-  <binding id="menucaption" extends="chrome://global/content/bindings/menu.xml#menu-base">
-    <content>
-      <xul:label class="menu-text" xbl:inherits="value=label,crop" crop="right"/>
-    </content>
-  </binding>
-
   <binding id="menu-menubar"
            extends="chrome://global/content/bindings/menu.xml#menu-base">
     <content>
@@ -236,7 +230,7 @@
     </content>
   </binding>
 
-  <binding id="menucaption-inmenulist" extends="chrome://global/content/bindings/menu.xml#menucaption">
+  <binding id="menucaption" extends="chrome://global/content/bindings/menu.xml#menu-base">
     <content>
       <xul:hbox class="menu-iconic-left" align="center" pack="center"
                 xbl:inherits="selected,disabled,checked">

toolkit/content/xul.css

@@ -956,10 +956,6 @@ menulist > menupopup > menuitem {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-noaccel");
 }
 
-menulist > menupopup > menucaption {
-  -moz-binding: url("chrome://global/content/bindings/menu.xml#menucaption-inmenulist");
-}
-
 dropmarker {
   -moz-binding: url("chrome://global/content/bindings/general.xml#dropmarker");
 }

toolkit/themes/linux/global/menu.css

@@ -104,7 +104,6 @@ menulist > menupopup > menu {
   font-weight: inherit;
 }
 
-menucaption > .menu-text,
 menucaption > .menu-iconic-text {
   margin-inline-start: 0 !important;
   font-weight: bold;

toolkit/themes/osx/global/menu.css

@@ -39,7 +39,6 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   color: inherit;
 }
 
-menucaption > .menu-text,
 menucaption > .menu-iconic-text {
   font-weight: bold;
 }

toolkit/themes/windows/global/menu.css

@@ -69,7 +69,6 @@ menuitem.spell-suggestion {
   padding-inline-end: 2px;
 }
 
-menucaption > .menu-text,
 menucaption > .menu-iconic-text {
   font-weight: bold;
   padding-inline-start: 0 !important;