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

chrome/browser/resources/chromeos/chromevox/walkers/table_walker.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 class for walking tables.
  * NOTE: This class has a very different interface than the other walkers.
  * This means it does not lend itself easily to e.g. decorators.
  * TODO (stoarca): This might be able to be fixed by breaking it up into
  * separate walkers for cell, row and column.
@@ skipping 38 matching lines @@
  */
 cvox.TableWalker.prototype.sync = function(sel) {
   return this.goTo_(sel, goog.bind(function(position) {
       return this.tt.goToCell(position);
   }, this));
 };
 
 /**
  * @override
  * @suppress {checkTypes} actual parameter 2 of
- * cvox.Msgs.prototype.getMsg does not match formal parameter
+ * Msgs.prototype.getMsg does not match formal parameter
  * found   : Array<number>
  * required: (Array<string>|null|undefined)
  */
 cvox.TableWalker.prototype.getDescription = function(prevSel, sel) {
   var position = this.syncPosition_(sel);
   if (!position) {
     return [];
   }
   this.tt.goToCell(position);
   var descs = cvox.DescriptionUtil.getCollectionDescription(prevSel, sel);
   if (descs.length == 0) {
     descs.push(new cvox.NavDescription({
-      annotation: cvox.ChromeVox.msgs.getMsg('empty_cell')
+      annotation: Msgs.getMsg('empty_cell')
     }));
   }
   return descs;
 };
 
 /**
  * @override
  */
 cvox.TableWalker.prototype.getBraille = function(prevSel, sel) {
   var ret = new cvox.NavBraille({});
@@ skipping 162 matching lines @@
 /**
  * Returns the text content of the header(s) of the cell that contains sel.
  * @param {!cvox.CursorSelection} sel The selection.
  * @return {!string} The header text.
  * @private
  */
 cvox.TableWalker.prototype.getHeaderText_ = function(sel) {
   this.tt.initialize(this.getTableNode_(sel));
   var position = this.tt.findNearestCursor(sel.start.node);
   if (!position) {
-    return cvox.ChromeVox.msgs.getMsg('not_inside_table');
+    return Msgs.getMsg('not_inside_table');
   }
   if (!this.tt.goToCell(position)) {
-    return cvox.ChromeVox.msgs.getMsg('not_inside_table');
+    return Msgs.getMsg('not_inside_table');
   }
   return (
       this.getRowHeaderText_(position) +
       ' ' +
       this.getColHeaderText_(position));
 };
 
 /**
  * Returns the location description.
  * @param {!cvox.CursorSelection} sel A valid selection.
  * @return {Array<cvox.NavDescription>} The location description.
  * @suppress {checkTypes} actual parameter 2 of
- * cvox.Msgs.prototype.getMsg does not match
+ * Msgs.prototype.getMsg does not match
  * formal parameter
  * found   : Array<number>
  * required: (Array<string>|null|undefined)
  * @private
  */
 cvox.TableWalker.prototype.getLocationDescription_ = function(sel) {
   var locationInfo = this.getLocationInfo(sel);
   if (locationInfo == null) {
     return null;
   }
   return [new cvox.NavDescription({
-    text: cvox.ChromeVox.msgs.getMsg('table_location', locationInfo)
+    text: Msgs.getMsg('table_location', locationInfo)
   })];
 };
 
 /**
  * Returns the text content of the row header(s) of the cell that contains sel.
  * @param {!Array<number>} position The selection.
  * @return {!string} The header text.
  * @private
  */
 cvox.TableWalker.prototype.getRowHeaderText_ = function(position) {
   // TODO(stoarca): OPTMZ Replace with join();
   var rowHeaderText = '';
 
   var rowHeaders = this.tt.getCellRowHeaders();
   if (rowHeaders.length == 0) {
     var firstCellInRow = this.tt.getCellAt([position[0], 0]);
     rowHeaderText += cvox.DomUtil.collapseWhitespace(
         cvox.DomUtil.getValue(firstCellInRow) + ' ' +
             cvox.DomUtil.getName(firstCellInRow));
-    return cvox.ChromeVox.msgs.getMsg('row_header') + rowHeaderText;
+    return Msgs.getMsg('row_header') + rowHeaderText;
   }
 
   for (var i = 0; i < rowHeaders.length; ++i) {
     rowHeaderText += cvox.DomUtil.collapseWhitespace(
         cvox.DomUtil.getValue(rowHeaders[i]) + ' ' +
             cvox.DomUtil.getName(rowHeaders[i]));
   }
   if (rowHeaderText == '') {
-    return cvox.ChromeVox.msgs.getMsg('empty_row_header');
+    return Msgs.getMsg('empty_row_header');
   }
-  return cvox.ChromeVox.msgs.getMsg('row_header') + rowHeaderText;
+  return Msgs.getMsg('row_header') + rowHeaderText;
 };
 
 /**
  * Returns the text content of the col header(s) of the cell that contains sel.
  * @param {!Array<number>} position The selection.
  * @return {!string} The header text.
  * @private
  */
 cvox.TableWalker.prototype.getColHeaderText_ = function(position) {
   // TODO(stoarca): OPTMZ Replace with join();
   var colHeaderText = '';
 
   var colHeaders = this.tt.getCellColHeaders();
   if (colHeaders.length == 0) {
     var firstCellInCol = this.tt.getCellAt([0, position[1]]);
     colHeaderText += cvox.DomUtil.collapseWhitespace(
         cvox.DomUtil.getValue(firstCellInCol) + ' ' +
         cvox.DomUtil.getName(firstCellInCol));
-    return cvox.ChromeVox.msgs.getMsg('column_header') + colHeaderText;
+    return Msgs.getMsg('column_header') + colHeaderText;
   }
 
   for (var i = 0; i < colHeaders.length; ++i) {
     colHeaderText += cvox.DomUtil.collapseWhitespace(
         cvox.DomUtil.getValue(colHeaders[i]) + ' ' +
             cvox.DomUtil.getName(colHeaders[i]));
   }
   if (colHeaderText == '') {
-    return cvox.ChromeVox.msgs.getMsg('empty_row_header');
+    return Msgs.getMsg('empty_row_header');
   }
-  return cvox.ChromeVox.msgs.getMsg('column_header') + colHeaderText;
+  return Msgs.getMsg('column_header') + colHeaderText;
 };
 
 /**
  * Returns the location info of sel within the containing table.
  * @param {!cvox.CursorSelection} sel The selection.
  * @return {Array<number>} The location info:
  *  [row index, row count, col index, col count].
  */
 cvox.TableWalker.prototype.getLocationInfo = function(sel) {
   this.tt.initialize(this.getTableNode_(sel));
   var position = this.tt.findNearestCursor(sel.start.node);
   if (!position) {
     return null;
   }
   // + 1 to account for 0-indexed
   return [
     position[0] + 1,
     this.tt.rowCount,
     position[1] + 1,
     this.tt.colCount
-  ].map(function(x) {return cvox.ChromeVox.msgs.getNumber(x);});
+  ].map(function(x) {return Msgs.getNumber(x);});
 };
 
 /**
  * Returns true if sel is inside a table.
  * @param {!cvox.CursorSelection} sel The selection.
  * @return {boolean} True if inside a table node.
  */
 cvox.TableWalker.prototype.isInTable = function(sel) {
   return this.getTableNode_(sel) != null;
 };
@@ skipping 37 matching lines @@
  * @return {Array<number>} The position [x, y] of the selection.
  * @private
  */
 cvox.TableWalker.prototype.syncPosition_ = function(sel) {
   var tableNode = this.getTableNode_(sel);
   this.tt.initialize(tableNode);
   // we need to align the TraverseTable with our sel because our walker
   // uses parts of it (for example isSpanned relies on being at a specific cell)
   return this.tt.findNearestCursor(sel.end.node);
 };