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

chrome/browser/resources/chromeos/chromevox/common/description_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 utility class for building NavDescriptions from the dom.
  */
 
 
 goog.provide('cvox.DescriptionUtil');
@@ skipping 198 matching lines @@
   // Now, generate a description for all other elements.
   var ancestors = cvox.DomUtil.getUniqueAncestors(prevNode, node, true);
   var desc = cvox.DescriptionUtil.getDescriptionFromAncestors(
       ancestors, recursive, verbosity);
   var prevAncestors = cvox.DomUtil.getUniqueAncestors(node, prevNode);
   if (cvox.DescriptionUtil.shouldDescribeExit_(prevAncestors)) {
     var prevDesc = cvox.DescriptionUtil.getDescriptionFromAncestors(
         prevAncestors, recursive, verbosity);
     if (prevDesc.context && !desc.context) {
       desc.context =
-          cvox.ChromeVox.msgs.getMsg('exited_container', [prevDesc.context]);
+          Msgs.getMsg('exited_container', [prevDesc.context]);
     }
   }
   return [desc];
 };
 
 
 /**
  * Returns an array of NavDescriptions that includes everything that would be
  * spoken by an object walker while traversing from prevSel to sel.
  * It also includes any necessary annotations and context about the set of
@@ skipping 139 matching lines @@
     var commonAnnotation = annotations[0];
     var firstContext = descriptions[0].context;
     descriptions[0].context = '';
     for (var i = 0; i < descriptions.length; i++) {
       descriptions[i].annotation = '';
     }
 
     descriptions.splice(0, 0, new cvox.NavDescription({
       context: firstContext,
       text: '',
-      annotation: cvox.ChromeVox.msgs.getMsg(
+      annotation: Msgs.getMsg(
           'collection',
           [commonAnnotation,
-           cvox.ChromeVox.msgs.getNumber(descriptions.length)])
+           Msgs.getNumber(descriptions.length)])
     }));
   }
 };
 
 
 /**
  * Pulls the annotations from a description array.
  * @param {Array<cvox.NavDescription>} descriptions The descriptions.
  * @return {Array<string>} The annotations.
  * @private
  */
 cvox.DescriptionUtil.getAnnotations_ = function(descriptions) {
   var annotations = [];
   for (var i = 0; i < descriptions.length; ++i) {
     var description = descriptions[i];
     if (annotations.indexOf(description.annotation) == -1) {
       // If we have an Internal link collection, call it Link collection.
       // NOTE(deboer): The message comparison is a symptom of a bad design.
       // I suspect this code belongs elsewhere but I don't know where, yet.
-      var linkMsg = cvox.ChromeVox.msgs.getMsg('tag_link');
+      var linkMsg = Msgs.getMsg('role_link');
       if (description.annotation.toLowerCase().indexOf(linkMsg.toLowerCase()) !=
           -1) {
         if (annotations.indexOf(linkMsg) == -1) {
           annotations.push(linkMsg);
         }
       } else {
         annotations.push(description.annotation);
       }
     }
   }
   return annotations;
 };
 
 
 /**
  * Returns true if this annotation should be grouped as a collection,
  * meaning that instead of repeating the annotation for each item, we
  * just announce <annotation> collection with <n> items at the front.
  *
  * Currently enabled for links, but could be extended to support other
  * roles that make sense.
  *
  * @param {string} annotation The annotation text.
  * @return {boolean} If this annotation should be a collection.
  * @private
  */
 cvox.DescriptionUtil.isAnnotationCollection_ = function(annotation) {
-  return (annotation == cvox.ChromeVox.msgs.getMsg('tag_link'));
+  return (annotation == Msgs.getMsg('role_link'));
 };
 
 /**
  * Determines whether to describe the exit of an ancestor chain.
  * @param {Array<Node>} ancestors The ancestors exited during navigation.
  * @return {boolean} The result.
  * @private
  */
 cvox.DescriptionUtil.shouldDescribeExit_ = function(ancestors) {
   return ancestors.some(function(node) {
@@ skipping 24 matching lines @@
   var ret = speechEngine.evaluateNode(traverse.activeNode);
   if (ret == []) {
     return [new cvox.NavDescription({'text': 'empty math'})];
   }
   if (cvox.ChromeVox.verbosity == cvox.VERBOSITY_VERBOSE) {
     ret[ret.length - 1].annotation = 'math';
   }
   ret[0].pushEarcon(cvox.Earcon.MATH);
   return ret;
 };