Improve braille related message descriptions and clean up message handling in Chromevox.

chrome/browser/resources/chromeos/chromevox/common/aria_util.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 A collection of JavaScript utilities used to simplify working
  * with ARIA (http://www.w3.org/TR/wai-aria).
  */
 
 
@@ skipping 13 matching lines @@
 
 
 /**
  * A mapping from ARIA role names to their message ids.
  * Note: If you are adding a new mapping, the new message identifier needs a
  * corresponding braille message. For example, a message id 'tag_button'
  * requires another message 'tag_button_brl' within messages.js.
  * @type {Object<string>}
  */
 cvox.AriaUtil.WIDGET_ROLE_TO_NAME = {
-  'alert' : 'aria_role_alert',
-  'alertdialog' : 'aria_role_alertdialog',
-  'button' : 'aria_role_button',
-  'checkbox' : 'aria_role_checkbox',
-  'columnheader' : 'aria_role_columnheader',
-  'combobox' : 'aria_role_combobox',
-  'dialog' : 'aria_role_dialog',
-  'grid' : 'aria_role_grid',
-  'gridcell' : 'aria_role_gridcell',
-  'link' : 'aria_role_link',
-  'listbox' : 'aria_role_listbox',
-  'log' : 'aria_role_log',
-  'marquee' : 'aria_role_marquee',
-  'menu' : 'aria_role_menu',
-  'menubar' : 'aria_role_menubar',
-  'menuitem' : 'aria_role_menuitem',
-  'menuitemcheckbox' : 'aria_role_menuitemcheckbox',
-  'menuitemradio' : 'aria_role_menuitemradio',
-  'option' : 'aria_role_option',
-  'progressbar' : 'aria_role_progressbar',
-  'radio' : 'aria_role_radio',
-  'radiogroup' : 'aria_role_radiogroup',
-  'rowheader' : 'aria_role_rowheader',
-  'scrollbar' : 'aria_role_scrollbar',
-  'slider' : 'aria_role_slider',
-  'spinbutton' : 'aria_role_spinbutton',
-  'status' : 'aria_role_status',
-  'tab' : 'aria_role_tab',
-  'tablist' : 'aria_role_tablist',
-  'tabpanel' : 'aria_role_tabpanel',
-  'textbox' : 'aria_role_textbox',
-  'timer' : 'aria_role_timer',
-  'toolbar' : 'aria_role_toolbar',
-  'tooltip' : 'aria_role_tooltip',
-  'treeitem' : 'aria_role_treeitem'
+  'alert' : 'role_alert',
+  'alertdialog' : 'role_alertdialog',
+  'button' : 'role_button',
+  'checkbox' : 'role_checkbox',
+  'columnheader' : 'role_columnheader',
+  'combobox' : 'role_combobox',
+  'dialog' : 'role_dialog',
+  'grid' : 'role_grid',
+  'gridcell' : 'role_gridcell',
+  'link' : 'role_link',
+  'listbox' : 'role_listbox',
+  'log' : 'role_log',
+  'marquee' : 'role_marquee',
+  'menu' : 'role_menu',
+  'menubar' : 'role_menubar',
+  'menuitem' : 'role_menuitem',
+  'menuitemcheckbox' : 'role_menuitemcheckbox',
+  'menuitemradio' : 'role_menuitemradio',
+  'option' : 'role_option',
+  'progressbar' : 'role_progressbar',
+  'radio' : 'role_radio',
+  'radiogroup' : 'role_radiogroup',
+  'rowheader' : 'role_rowheader',
+  'scrollbar' : 'role_scrollbar',
+  'slider' : 'role_slider',
+  'spinbutton' : 'role_spinbutton',
+  'status' : 'role_status',
+  'tab' : 'role_tab',
+  'tablist' : 'role_tablist',
+  'tabpanel' : 'role_tabpanel',
+  'textbox' : 'role_textbox',
+  'timer' : 'role_timer',
+  'toolbar' : 'role_toolbar',
+  'tooltip' : 'role_tooltip',
+  'treeitem' : 'role_treeitem'
 };
 
 
 /**
  * Note: If you are adding a new mapping, the new message identifier needs a
  * corresponding braille message. For example, a message id 'tag_button'
  * requires another message 'tag_button_brl' within messages.js.
  * @type {Object<string>}
  */
 cvox.AriaUtil.STRUCTURE_ROLE_TO_NAME = {
-  'article' : 'aria_role_article',
-  'application' : 'aria_role_application',
-  'banner' : 'aria_role_banner',
-  'columnheader' : 'aria_role_columnheader',
-  'complementary' : 'aria_role_complementary',
-  'contentinfo' : 'aria_role_contentinfo',
-  'definition' : 'aria_role_definition',
-  'directory' : 'aria_role_directory',
-  'document' : 'aria_role_document',
-  'form' : 'aria_role_form',
-  'group' : 'aria_role_group',
-  'heading' : 'aria_role_heading',
-  'img' : 'aria_role_img',
-  'list' : 'aria_role_list',
-  'listitem' : 'aria_role_listitem',
-  'main' : 'aria_role_main',
-  'math' : 'aria_role_math',
-  'navigation' : 'aria_role_navigation',
-  'note' : 'aria_role_note',
-  'region' : 'aria_role_region',
-  'rowheader' : 'aria_role_rowheader',
-  'search' : 'aria_role_search',
-  'separator' : 'aria_role_separator'
+  'article' : 'role_article',
+  'application' : 'role_application',
+  'banner' : 'role_banner',
+  'columnheader' : 'role_columnheader',
+  'complementary' : 'role_complementary',
+  'contentinfo' : 'role_contentinfo',
+  'definition' : 'role_definition',
+  'directory' : 'role_directory',
+  'document' : 'role_document',
+  'form' : 'role_form',
+  'group' : 'role_group',
+  'heading' : 'role_heading',
+  'img' : 'role_img',
+  'list' : 'role_list',
+  'listitem' : 'role_listitem',
+  'main' : 'role_main',
+  'math' : 'role_math',
+  'navigation' : 'role_navigation',
+  'note' : 'role_note',
+  'region' : 'role_region',
+  'rowheader' : 'role_rowheader',
+  'search' : 'role_search',
+  'separator' : 'role_separator'
 };
 
 
 /**
  * @type {Array<Object>}
  */
 cvox.AriaUtil.ATTRIBUTE_VALUE_TO_STATUS = [
   { name: 'aria-autocomplete', values:
       {'inline' : 'aria_autocomplete_inline',
        'list' : 'aria_autocomplete_list',
@@ skipping 180 matching lines @@
  * @return {string} The role name message identifier      for the targetNode.
  */
 cvox.AriaUtil.getRoleNameMsg = function(targetNode) {
   var roleName;
   if (targetNode && targetNode.getAttribute) {
     var role = cvox.AriaUtil.getRoleAttribute(targetNode);
 
     // Special case for pop-up buttons.
     if (targetNode.getAttribute('aria-haspopup') == 'true' &&
         cvox.AriaUtil.isButton(targetNode)) {
-      return 'aria_role_popup_button';
+      return 'role_popup_button';
     }
 
     if (role) {
       roleName = cvox.AriaUtil.getRoleNameMsgForRole_(role);
       if (!roleName) {
         roleName = cvox.AriaUtil.STRUCTURE_ROLE_TO_NAME[role];
       }
     }
 
     // To a user, a menu item within a menu bar is called a "menu";
@@ skipping 25 matching lines @@
 
 /**
  * Returns a string to be presented to the user that identifies what the
  * targetNode's role is.
  *
  * @param {Node} targetNode The node to get the role name for.
  * @return {string} The role name for the targetNode.
  */
 cvox.AriaUtil.getRoleName = function(targetNode) {
   var roleMsg = cvox.AriaUtil.getRoleNameMsg(targetNode);
-  var roleName = cvox.ChromeVox.msgs.getMsg(roleMsg);
+  var roleName = Msgs.getMsg(roleMsg);
   var role = cvox.AriaUtil.getRoleAttribute(targetNode);
   if ((role == 'heading') && (targetNode.hasAttribute('aria-level'))) {
     roleName += ' ' + targetNode.getAttribute('aria-level');
   }
   return roleName ? roleName : '';
 };
 
 /**
  * Returns a string that gives information about the state of the targetNode.
  *
@@ skipping 175 matching lines @@
 
   if (activeDescendant) {
     var descendantSelector = '*[role~="row"]';
     var rows = parentControl.querySelectorAll(descendantSelector);
     var currentIndex = null;
     for (var j = 0; j < rows.length; j++) {
       var gridcells = rows[j].querySelectorAll('*[role~="gridcell"]');
       for (var k = 0; k < gridcells.length; k++) {
         if (gridcells[k] == activeDescendant) {
           return /** @type {cvox.NodeState} */ (
-                  [['aria_role_gridcell_pos', j + 1, k + 1]]);
+                  [['role_gridcell_pos', j + 1, k + 1]]);
         }
       }
     }
   }
   return [];
 };
 
 
 /**
  * Returns the id of a node's active descendant
@@ skipping 414 matching lines @@
  * @param {Node} node The node to be checked.
  * @return {boolean} Whether or not the node is an ARIA math node.
  */
 cvox.AriaUtil.isMath = function(node) {
   if (!node || !node.getAttribute) {
     return false;
   }
   var role = cvox.AriaUtil.getRoleAttribute(node);
   return role == 'math';
 };