Bug 1422386 - Remove toolbardecoration, toolbar, and toolbar-base binding, r=Paolo

The only purpose of these bindings was to insert a stylesheet, which has been
moved to be included in toolkit/content/components.css.

MozReview-Commit-ID: 23jqkIrbVvi

--HG--
extra : rebase_source : 8d13f7a8afa730207d40e1457e36ec51331c4ea7

browser/components/customizableui/content/toolbar.xml

@@ -9,9 +9,6 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="toolbar">
-    <resources>
-      <stylesheet src="chrome://global/skin/toolbar.css"/>
-    </resources>
     <implementation>
       <field name="overflowedDuringConstruction">null</field>
 

toolkit/components/printing/content/printPreviewBindings.xml

@@ -15,8 +15,7 @@
    xmlns="http://www.mozilla.org/xbl"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <binding id="printpreviewtoolbar"
+  <binding id="printpreviewtoolbar">
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <resources>
       <stylesheet src="chrome://global/skin/printPreview.css"/>
     </resources>

toolkit/content/components.css

@@ -7,3 +7,4 @@
   ======================================================================= */
 
 @import url("chrome://global/skin/menu.css");
+@import url("chrome://global/skin/toolbar.css");

toolkit/content/widgets/findbar.xml

@@ -153,8 +153,7 @@
     </handlers>
   </binding>
 
-  <binding id="findbar"
+  <binding id="findbar">
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <resources>
       <stylesheet src="chrome://global/skin/findBar.css"/>
     </resources>

toolkit/content/widgets/toolbar.xml

@@ -9,17 +9,7 @@
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
           xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="toolbar-base">
+  <binding id="toolbar-menubar-autohide">
-    <resources>
-      <stylesheet src="chrome://global/skin/toolbar.css"/>
-    </resources>
-  </binding>
-
-  <binding id="toolbar"
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" />
-
-  <binding id="toolbar-menubar-autohide"
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <implementation>
       <constructor>
         this._setInactive();
@@ -114,8 +104,7 @@
     </handlers>
   </binding>
 
-  <binding id="toolbar-drag"
+  <binding id="toolbar-drag">
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <implementation>
       <field name="_dragBindingAlive">true</field>
       <constructor><![CDATA[
@@ -136,8 +125,7 @@
     </implementation>
   </binding>
 
-  <binding id="menubar"
+  <binding id="menubar" extends="xul:menubar">
-           extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:menubar">
     <implementation>
        <field name="_active">false</field>
        <field name="_statusbar">null</field>
@@ -181,10 +169,7 @@
     </handlers>
   </binding>
 
-  <binding id="toolbardecoration" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base">
+  <binding id="toolbarpaletteitem" extends="xul:button">
-  </binding>
-
-  <binding id="toolbarpaletteitem" extends="chrome://global/content/bindings/toolbar.xml#toolbar-base" display="xul:button">
     <content>
       <xul:hbox class="toolbarpaletteitem-box" flex="1" xbl:inherits="type,place">
         <children/>

toolkit/content/xul.css

@@ -286,10 +286,6 @@ toolbox {
   -moz-box-orient: vertical;
 }
 
-toolbar {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar");
-}
-
 toolbar[customizing="true"][collapsed="true"] {
   /* Some apps, e.g. Firefox, use 'collapsed' to hide toolbars.
      Override it while customizing. */
@@ -321,16 +317,7 @@ toolbar[type="menubar"][autohide="true"][inactive="true"]:not([customizing="true
 }
 %endif
 
-toolbarseparator {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
-}
-
-toolbarspacer {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
-}
-
 toolbarspring {
-  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbardecoration");
   -moz-box-flex: 1000;
 }