Adjust output rules related menus

chrome/browser/resources/chromeos/chromevox/cvox2/background/output.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview Provides output services for ChromeVox.
  */
 
 goog.provide('Output');
 goog.provide('Output.EventType');
@@ skipping 80 matching lines @@
 /**
  * Delimiter to use between output values.
  * @type {string}
  */
 Output.SPACE = ' ';
 
 /**
  * Metadata about supported automation roles.
  * @const {Object<{msgId: string,
  *                 earconId: (string|undefined),
- *                 inherits: (string|undefined)}>}
+ *                 inherits: (string|undefined),
+ *                 ignoreAncestry: (boolean|undefined)}>}
  * msgId: the message id of the role.
  * earconId: an optional earcon to play when encountering the role.
  * inherits: inherits rules from this role.
+ * ignoreAncestry: don't output ancestry changes when encountering this role.
  * @private
  */
 Output.ROLE_INFO_ = {
   alert: {
     msgId: 'role_alert',
     earconId: 'ALERT_NONMODAL'
   },
   alertDialog: {
     msgId: 'role_alertdialog'
   },
@@ skipping 101 matching lines @@
     inherits: 'abstractContainer'
   },
   marquee: {
     msgId: 'role_marquee',
   },
   math: {
     msgId: 'role_math',
     inherits: 'abstractContainer'
   },
   menu: {
-    msgId: 'role_menu',
-    earconId: 'LISTBOX',
+    msgId: 'role_menu'
   },
   menuBar: {
     msgId: 'role_menubar',
   },
   menuItem: {
     msgId: 'role_menuitem',
-    earconId: 'BUTTON'
+    ignoreAncestry: true
   },
   menuItemCheckBox: {
     msgId: 'role_menuitemcheckbox',
-    earconId: 'BUTTON'
+    ignoreAncestry: true
   },
   menuItemRadio: {
     msgId: 'role_menuitemradio',
-    earconId: 'BUTTON'
+    ignoreAncestry: true
   },
   menuListOption: {
-    msgId: 'role_menuitem'
+    msgId: 'role_menuitem',
+    ignoreAncestry: true
   },
   menuListPopup: {
     msgId: 'role_menu'
   },
   navigation: {
     msgId: 'role_navigation',
     inherits: 'abstractContainer'
   },
   note: {
     msgId: 'role_note',
@@ skipping 209 matching lines @@
     },
     menu: {
       enter: '$name $role',
       speak: '$name $role @@list_with_items($countChildren(menuItem))'
     },
     menuItem: {
       speak: '$name $role $if($haspopup, @has_submenu) ' +
           '@describe_index($indexInParent, $parentChildCount) ' +
           '$description'
     },
+    menuItemCheckBox: {
+      speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' +
+          '$name $role $checked $description ' +
+          '@describe_index($indexInParent, $parentChildCount) '
+    },
+    menuItemRadio: {
+      speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' +
+          '$if($checked, @describe_radio_selected($name), ' +
+          '@describe_radio_unselected($name)) $description ' +
+          '@describe_index($indexInParent, $parentChildCount) '
+    },
     menuListOption: {
       speak: '$name @role_menuitem ' +
           '@describe_index($indexInParent, $parentChildCount) $description'
     },
     paragraph: {
       speak: '$descendants'
     },
     popUpButton: {
       speak: '$value $name $role @aria_has_popup ' +
           '$if($collapsed, @aria_expanded_false, @aria_expanded_true) ' +
           '$description'
     },
     radioButton: {
-      speak: '$if($checked, @describe_radio_selected($name), ' +
+      speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' +
+          '$if($checked, @describe_radio_selected($name), ' +
           '@describe_radio_unselected($name)) $description'
     },
     radioGroup: {
       enter: '$name $role $description'
     },
     rootWebArea: {
       enter: '$name',
       speak: '$if($name, $name, $docUrl)'
     },
     region: {
@@ skipping 814 matching lines @@
   },
 
   /**
    * @param {!AutomationNode} node
    * @param {!AutomationNode} prevNode
    * @param {EventType|Output.EventType} type
    * @param {!Array<Spannable>} buff
    * @private
    */
   ancestry_: function(node, prevNode, type, buff) {
+    // Check to see if ancestry output is ignored.
+    if (Output.ROLE_INFO_[node.role] &&
+        Output.ROLE_INFO_[node.role].ignoreAncestry)
+      return;
+
     var prevUniqueAncestors =
         AutomationUtil.getUniqueAncestors(node, prevNode);
     var uniqueAncestors = AutomationUtil.getUniqueAncestors(prevNode, node);
 
     // First, look up the event type's format block.
     // Navigate is the default event.
     var eventBlock = Output.RULES[type] || Output.RULES['navigate'];
 
     var getMergedRoleBlock = function(role) {
       var parentRole = (Output.ROLE_INFO_[role] || {}).inherits;
@@ skipping 290 matching lines @@
           break;
         }
         earconFinder = earconFinder.parent;
       }
     }
     return null;
   }
 };
 
 });  // goog.scope