Use new earcons in ChromeVox Next.

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 197 matching lines @@
     msgId: 'aria_role_math',
     inherits: 'abstractContainer'
   },
   menu: {
     msgId: 'aria_role_menu'
   },
   menuBar: {
     msgId: 'aria_role_menubar',
   },
   menuItem: {
-    msgId: 'aria_role_menuitem'
+    msgId: 'aria_role_menuitem',
+    earconId: 'BUTTON'
   },
   menuItemCheckBox: {
-    msgId: 'aria_role_menuitemcheckbox'
+    msgId: 'aria_role_menuitemcheckbox',
+    earconId: 'BUTTON'
   },
   menuItemRadio: {
-    msgId: 'aria_role_menuitemradio'
+    msgId: 'aria_role_menuitemradio',
+    earconId: 'BUTTON'
   },
   menuListOption: {
     msgId: 'aria_role_menuitem'
   },
   menuListPopup: {
     msgId: 'aria_role_menu'
   },
   navigation: {
     msgId: 'aria_role_navigation',
     inherits: 'abstractContainer'
   },
   note: {
     msgId: 'aria_role_note',
     inherits: 'abstractContainer'
   },
   popUpButton: {
     msgId: 'tag_button',
-    earcon: 'LISTBOX'
   },
   radioButton: {
     msgId: 'input_type_radio'
   },
   radioGroup: {
     msgId: 'aria_role_radiogroup',
   },
   region: {
     msgId: 'aria_role_region',
     inherits: 'abstractContainer'
@@ skipping 61 matching lines @@
  *                  off: {msgId: string, earconId: string},
  *                  omitted: {msgId: string, earconId: string}}>}
  *     on: info used to describe a state that is set to true.
  *     off: info used to describe a state that is set to false.
  *     omitted: info used to describe a state that is undefined.
  * @private
  */
 Output.STATE_INFO_ = {
   checked: {
     on: {
-      earconId: 'CHECK_ON',
       msgId: 'checkbox_checked_state'
     },
     off: {
-      earconId: 'CHECK_OFF',
       msgId: 'checkbox_unchecked_state'
     },
     omitted: {
-      earconId: 'CHECK_OFF',
       msgId: 'checkbox_unchecked_state'
     }
   },
   collapsed: {
     on: {
       msgId: 'aria_expanded_false'
     },
     off: {
       msgId: 'aria_expanded_true'
     }
@@ skipping 30 matching lines @@
     alert: {
       speak: '!doNotInterrupt $role $descendants'
     },
     alertDialog: {
       enter: '$name $role $descendants'
     },
     cell: {
       enter: '@column_granularity $tableCellColumnIndex'
     },
     checkBox: {
-      speak: '$name $role $checked'
+      speak: '$if($checked, $earcon(CHECK_ON), $earcon(CHECK_OFF)) ' +
+             '$name $role $checked'
     },
     dialog: {
       enter: '$name $role'
     },
     grid: {
       enter: '$name $role'
     },
     heading: {
       enter: '@tag_h+$hierarchicalLevel',
       speak: '@tag_h+$hierarchicalLevel $nameOrDescendants='
@@ skipping 26 matching lines @@
           '@describe_index($indexInParent, $parentChildCount)'
     },
     menuListOption: {
       speak: '$name $value @aria_role_menuitem ' +
           '@describe_index($indexInParent, $parentChildCount)'
     },
     paragraph: {
       speak: '$descendants'
     },
     popUpButton: {
-      speak: '$value $name $role @aria_has_popup ' +
+      speak: '$earcon(POP_UP_BUTTON) $value $name $role @aria_has_popup ' +
           '$if($collapsed, @aria_expanded_false, @aria_expanded_true)'
     },
     radioButton: {
       speak: '$if($checked, @describe_radio_selected($name), ' +
           '@describe_radio_unselected($name))'
     },
     radioGroup: {
       enter: '$name $role'
     },
     rootWebArea: {
       enter: '$name'
     },
     row: {
       enter: '@row_granularity $tableRowIndex'
     },
     slider: {
-      speak: '@describe_slider($value, $name) $help'
+      speak: '$earcon(SLIDER) @describe_slider($value, $name) $help'
     },
     staticText: {
       speak: '$value='
     },
     tab: {
       speak: '@describe_tab($name)'
     },
     textField: {
       speak: '$name $value $if(' +
           '$inputType, @input_type_+$inputType, @input_type_text)',
@@ skipping 195 matching lines @@
     return this;
   },
 
   /**
    * Executes all specified output.
    */
   go: function() {
     // Speech.
     var queueMode = cvox.QueueMode.FLUSH;
     this.speechBuffer_.forEach(function(buff, i, a) {
-      if (buff.toString()) {
-        (function() {
-          var scopedBuff = buff;
-          this.speechProperties_['startCallback'] = function() {
-            var actions = scopedBuff.getSpansInstanceOf(Output.Action);
-            if (actions) {
-              actions.forEach(function(a) {
-                a.run();
-              });
-            }
-          };
-        }.bind(this)());
+      (function() {
+        var scopedBuff = buff;
+        this.speechProperties_['startCallback'] = function() {
+          var actions = scopedBuff.getSpansInstanceOf(Output.Action);
+          if (actions) {
+            actions.forEach(function(a) {
+              a.run();
+            });
+          }
+        };
+      }.bind(this)());
 
-        if (this.speechEndCallback_ && i == a.length - 1)
-          this.speechProperties_['endCallback'] = this.speechEndCallback_;
-        else
-          this.speechProperties_['endCallback'] = null;
-        cvox.ChromeVox.tts.speak(
-            buff.toString(), queueMode, this.speechProperties_);
-        queueMode = cvox.QueueMode.QUEUE;
-      }
+      if (this.speechEndCallback_ && i == a.length - 1)
+        this.speechProperties_['endCallback'] = this.speechEndCallback_;
+      else
+        this.speechProperties_['endCallback'] = null;
+      cvox.ChromeVox.tts.speak(
+          buff.toString(), queueMode, this.speechProperties_);
+      queueMode = cvox.QueueMode.QUEUE;
     }.bind(this));
 
     // Braille.
     if (this.brailleBuffer_.length) {
       var buff = this.createBrailleOutput_();
       var selSpan =
           buff.getSpanInstanceOf(Output.SelectionSpan);
       var startIndex = -1, endIndex = -1;
       if (selSpan) {
         // Casts ok, since the span is known to be in the spannable.
@@ skipping 227 matching lines @@
             var cond = tree.firstChild;
             var attrib = cond.value.slice(1);
             if (node[attrib] || node.state[attrib])
               this.format_(node, cond.nextSibling, buff);
             else
               this.format_(node, cond.nextSibling.nextSibling, buff);
           } else if (token == 'earcon') {
             // Ignore unless we're generating speech output.
             if (!this.formatOptions_.speech)
               return;
-            // Assumes there's existing output in our buffer.
-            var lastBuff = buff[buff.length - 1];
-            if (!lastBuff)
-              return;
 
-            lastBuff.setSpan(
+            options.annotation.push(
                 new Output.EarconAction(tree.firstChild.value), 0, 0);
+            this.append_(buff, '', options);
           } else if (token == 'countChildren') {
             var role = tree.firstChild.value;
             var count = node.children.filter(function(e) {
               return e.role == role;
             }).length;
             this.append_(buff, String(count));
           }
         }
       } else if (prefix == '@') {
         var isPluralized = (token[0] == '@');
@@ skipping 344 matching lines @@
             elem.end);
       });
       spansToRemove.forEach(result.removeSpan.bind(result));
       separator = Output.SPACE;
     });
     return result;
   }
 };
 
 });  // goog.scope