From 1af9b460c90055696b1bed65327dbfab13a826e1 Mon Sep 17 00:00:00 2001
From: Marco Zehe <mzehe@mozilla.com>
Date: Wed, 5 Feb 2014 17:33:43 +0100
Subject: [PATCH] Bug 968111 - Fix various accessibility markup issues in
 Toolkit XUL files, r=da0

---
 toolkit/components/apppicker/content/appPicker.xul  |  3 ++-
 .../cookie/content/cookieAcceptDialog.xul           | 13 +++++++------
 toolkit/components/viewconfig/content/config.xul    |  1 +
 .../downloads/content/unknownContentType.xul        |  7 ++++---
 toolkit/mozapps/handling/content/dialog.xul         |  5 +++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/toolkit/components/apppicker/content/appPicker.xul b/toolkit/components/apppicker/content/appPicker.xul
index 5f82fb161bce..3a50483c1c20 100644
--- a/toolkit/components/apppicker/content/appPicker.xul
+++ b/toolkit/components/apppicker/content/appPicker.xul
@@ -18,6 +18,7 @@
     defaultButton="cancel"
     ondialogaccept="return g_dialog.appPickerOK();"
     ondialogcancel="return g_dialog.appPickerCancel();"
+    aria-describedby="content-description suggested-filename"
     persist="screenX screenY">
 
     <script type="application/javascript" src="chrome://global/content/appPicker.js"/>
@@ -30,7 +31,7 @@
       </vbox>
     </hbox>
 
-    <label id="sendto-message" value="&SendMsg.label;" for="app-picker-listbox"/>
+    <label id="sendto-message" value="&SendMsg.label;" control="app-picker-listbox"/>
 
     <listbox id="app-picker-listbox" rows="5"
              ondblclick="g_dialog.appDoubleClick();"/>
diff --git a/toolkit/components/cookie/content/cookieAcceptDialog.xul b/toolkit/components/cookie/content/cookieAcceptDialog.xul
index 1708d7460e8b..99fd92c0c975 100644
--- a/toolkit/components/cookie/content/cookieAcceptDialog.xul
+++ b/toolkit/components/cookie/content/cookieAcceptDialog.xul
@@ -23,6 +23,7 @@
     ondialogaccept="return doOKButton();"
     title="&dialog.title;"
     buttons="disclosure"
+    aria-describedby="dialog-header"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script src="cookieAcceptDialog.js" type="application/javascript"/>
@@ -69,42 +70,42 @@
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label value="&props.name.label;"/>
+              <label value="&props.name.label;" control="ifl_name"/>
             </hbox>
             <textbox id="ifl_name" readonly="true" class="plain"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label value="&props.value.label;"/>
+              <label value="&props.value.label;" control="ifl_value"/>
             </hbox>
             <textbox id="ifl_value" readonly="true" class="plain"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label id="ifl_isDomain" value="&props.domain.label;"/>
+              <label id="ifl_isDomain" value="&props.domain.label;" control="ifl_host"/>
             </hbox>
             <textbox id="ifl_host" readonly="true" class="plain"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label value="&props.path.label;"/>
+              <label value="&props.path.label;" control="ifl_path"/>
             </hbox>
             <textbox id="ifl_path" readonly="true" class="plain"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label value="&props.secure.label;"/>
+              <label value="&props.secure.label;" control="ifl_isSecure"/>
             </hbox>
             <textbox id="ifl_isSecure" readonly="true" class="plain"/>
           </row>
 
           <row align="center">
             <hbox align="center" pack="end">
-              <label value="&props.expires.label;"/>
+              <label value="&props.expires.label;" control="ifl_expires"/>
             </hbox>
             <textbox id="ifl_expires" readonly="true" class="plain"/>
           </row>
diff --git a/toolkit/components/viewconfig/content/config.xul b/toolkit/components/viewconfig/content/config.xul
index a3ac63141eca..24330a42b872 100644
--- a/toolkit/components/viewconfig/content/config.xul
+++ b/toolkit/components/viewconfig/content/config.xul
@@ -13,6 +13,7 @@
         title="&window.title;"
         windowtype="Preferences:ConfigManager"
         role="application"
+        aria-describedby="warningTitle warningText"
         width="750"
         height="500"
         disablefastfind="true"
diff --git a/toolkit/mozapps/downloads/content/unknownContentType.xul b/toolkit/mozapps/downloads/content/unknownContentType.xul
index 871fd7b20209..5465ce3e4327 100644
--- a/toolkit/mozapps/downloads/content/unknownContentType.xul
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xul
@@ -27,6 +27,7 @@
 #endif
         screenX="" screenY=""
         persist="screenX screenY"
+        aria-describedby="intro location whichIs type from source unknownPrompt"
         ondialogaccept="return dialog.onOK()"
         ondialogcancel="return dialog.onCancel()">
 
@@ -35,7 +36,7 @@
   <stringbundle id="strings" src="chrome://mozapps/locale/downloads/unknownContentType.properties"/>
 
   <vbox flex="1" id="container">  
-    <description>&intro2.label;</description>
+    <description id="intro">&intro2.label;</description>
     <separator class="thin"/>
     <hbox align="start" class="small-indent">
       <image id="contentTypeImage"/>
@@ -43,7 +44,7 @@
         <description id="location" class="plain" crop="start" flex="1"/>
         <separator class="thin"/>
         <hbox align="center">
-          <label value="&whichIs.label;"/>
+          <label id="whichIs" value="&whichIs.label;"/>
           <textbox id="type" class="plain" readonly="true" flex="1" noinitialfocus="true"/>
         </hbox>
         <hbox align="center">
@@ -56,7 +57,7 @@
     <separator class="thin"/>
 
     <hbox align="center" id="basicBox" collapsed="true">
-      <label value="&unknownPromptText.label;" flex="1"/>
+      <label id="unknownPrompt" value="&unknownPromptText.label;" flex="1"/>
     </hbox>
 
     <groupbox flex="1" id="normalBox">
diff --git a/toolkit/mozapps/handling/content/dialog.xul b/toolkit/mozapps/handling/content/dialog.xul
index 0e9a483f8440..89da1beb4458 100644
--- a/toolkit/mozapps/handling/content/dialog.xul
+++ b/toolkit/mozapps/handling/content/dialog.xul
@@ -13,6 +13,7 @@
         onload="dialog.initialize();"
         style="min-width: &window.emWidth;; min-height: &window.emHeight;;"
         persist="width height screenX screenY"
+        aria-describedby="description-text"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script src="chrome://mozapps/content/handling/dialog.js" type="application/javascript"/>
@@ -28,7 +29,7 @@
   </hbox>
 
   <vbox flex="1">
-    <label id="item-action-text" for="items"/>
+    <label id="item-action-text" control="items"/>
     <richlistbox id="items" flex="1"
                  ondblclick="dialog.onDblClick();"
                  onselect="dialog.updateOKButton();">
@@ -40,7 +41,7 @@
     </richlistbox>
   </vbox>
 
-  <checkbox id="remember" oncommand="dialog.onCheck();"/>
+  <checkbox id="remember" aria-describedby="remember-text" oncommand="dialog.onCheck();"/>
   <description id="remember-text"/>
 
 </dialog>