Shorten Closure template notation from Array.<*> to Array<*> in cvox.

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 16 matching lines @@
  * A constant indicating no role name.
  * @type {string}
  */
 cvox.AriaUtil.NO_ROLE_NAME = ' ';
 
 /**
  * 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, string>}
+ * @type {Object<string, 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',
@@ skipping 24 matching lines @@
   'toolbar' : 'aria_role_toolbar',
   'tooltip' : 'aria_role_tooltip',
   'treeitem' : 'aria_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, string>}
+ * @type {Object<string, 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'
 };
 
 
 /**
- * @type {Array.<Object>}
+ * @type {Array<Object>}
  */
 cvox.AriaUtil.ATTRIBUTE_VALUE_TO_STATUS = [
   { name: 'aria-autocomplete', values:
       {'inline' : 'aria_autocomplete_inline',
        'list' : 'aria_autocomplete_list',
        'both' : 'aria_autocomplete_both'} },
   { name: 'aria-checked', values:
       {'true' : 'aria_checked_true',
        'false' : 'aria_checked_false',
        'mixed' : 'aria_checked_mixed'} },
@@ skipping 251 matching lines @@
  */
 cvox.AriaUtil.getStateMsgs = function(targetNode, primary) {
   var state = [];
   if (!targetNode || !targetNode.getAttribute) {
     return state;
   }
 
   for (var i = 0, attr; attr = cvox.AriaUtil.ATTRIBUTE_VALUE_TO_STATUS[i];
       i++) {
     var value = targetNode.getAttribute(attr.name);
-    var msg_id = attr.values[value];
-    if (msg_id) {
-      state.push([msg_id]);
+    var msgId = attr.values[value];
+    if (msgId) {
+      state.push([msgId]);
     }
   }
   if (targetNode.getAttribute('role') == 'grid') {
       return cvox.AriaUtil.getGridState_(targetNode, targetNode);
   }
 
   var role = cvox.AriaUtil.getRoleAttribute(targetNode);
   if (targetNode.getAttribute('aria-haspopup') == 'true') {
     if (role == 'menuitem') {
       state.push(['has_submenu']);
@@ skipping 179 matching lines @@
     return null;
   }
   return activeId;
 };
 
 
 /**
  * Returns the list of elements that are one aria-level below.
  *
  * @param {Node} parentControl The node whose descendants should be analyzed.
- * @param {Array.<string>} role The role(s) of descendant we are looking for.
- * @return {Array.<Node>} The array of matching nodes.
+ * @param {Array<string>} role The role(s) of descendant we are looking for.
+ * @return {Array<Node>} The array of matching nodes.
  */
 cvox.AriaUtil.getNextLevel = function(parentControl, role) {
   var result = [];
   var children = parentControl.childNodes;
   var length = children.length;
   for (var i = 0; i < children.length; i++) {
     if (cvox.AriaUtil.isHidden(children[i]) ||
         !cvox.DomUtil.isVisible(children[i])) {
       continue;
     }
     var nextLevel = cvox.AriaUtil.getNextLevelItems(children[i], role);
     if (nextLevel.length > 0) {
       result = result.concat(nextLevel);
     }
   }
   return result;
 };
 
 
 /**
  * Recursively finds the first node(s) that match the role.
  *
  * @param {Element} current The node to start looking at.
- * @param {Array.<string>} role The role(s) to match.
- * @return {Array.<Element>} The array of matching nodes.
+ * @param {Array<string>} role The role(s) to match.
+ * @return {Array<Element>} The array of matching nodes.
  */
 cvox.AriaUtil.getNextLevelItems = function(current, role) {
   if (current.nodeType != 1) { // If reached a node that is not an element.
     return [];
   }
   if (role.indexOf(cvox.AriaUtil.getRoleAttribute(current)) != -1) {
     return [current];
   } else {
     var children = current.childNodes;
     var length = children.length;
@@ skipping 208 matching lines @@
     return (tokens.indexOf(change) >= 0);
   }
 };
 
 
 /**
  * Given a node, return all live regions that are either rooted at this
  * node or contain this node.
  *
  * @param {Node} node The node to be checked.
- * @return {Array.<Element>} All live regions affected by this node changing.
+ * @return {Array<Element>} All live regions affected by this node changing.
  */
 cvox.AriaUtil.getLiveRegions = function(node) {
   var result = [];
   if (node.querySelectorAll) {
     var nodes = node.querySelectorAll(
         '[role="alert"], [role="log"],  [role="marquee"], ' +
         '[role="status"], [role="timer"],  [aria-live]');
     if (nodes) {
       for (var i = 0; i < nodes.length; i++) {
         result.push(nodes[i]);
@@ skipping 127 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';
 };