Support output of heading levels.

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 151 matching lines @@
     alert: {
       speak: '!doNotInterrupt $role $descendants'
     },
     checkBox: {
       speak: '$name $role $checked'
     },
     dialog: {
       enter: '$name $role'
     },
     heading: {
-      enter: '@aria_role_heading',
-      speak: '@aria_role_heading $name='
+      enter: '@tag_h+$hierarchicalLevel',
+      speak: '@tag_h+$hierarchicalLevel $name='
     },
     inlineTextBox: {
       speak: '$value='
     },
     link: {
       enter: '$name $visited $role',
       stay: '$name= $visited $role',
       speak: '$name= $visited $role'
     },
     list: {
@@ skipping 432 matching lines @@
             // Assumes there's existing output in our buffer.
             var lastBuff = buff[buff.length - 1];
             if (!lastBuff)
               return;
 
             lastBuff.setSpan(
                 new Output.EarconAction(tree.firstChild.value), 0, 0);
           }
         }
       } else if (prefix == '@') {
+        // Tokens can have substitutions.
+        var pieces = token.split('+');
+        token = pieces.reduce(function(prev, cur) {
+          var lookup = cur;
+          if (cur[0] == '$')
+            lookup = node.attributes[cur.slice(1)];
+          return prev + lookup;
+        }.bind(this), '');
         var msgId = token;
         var msgArgs = [];
         var curMsg = tree.firstChild;
 
         while (curMsg) {
           var arg = curMsg.value;
           if (arg[0] != '$') {
             console.error('Unexpected value: ' + arg);
             return;
           }
@@ skipping 223 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope