Revert of Make ChromeVox Next a setting in options page.

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 388 matching lines @@
   'url': 'input_type_url',
 };
 
 /**
  * Rules specifying format of AutomationNodes for output.
  * @type {!Object<Object<Object<string>>>}
  */
 Output.RULES = {
   navigate: {
     'default': {
-      speak: '$name $value $state $role $description',
+      speak: '$name $value $role $description',
       braille: ''
     },
     abstractContainer: {
       enter: '$nameFromNode $role $description',
       leave: '@exited_container($role)'
     },
     alert: {
       speak: '!doNotInterrupt $role $descendants'
     },
     alertDialog: {
@@ skipping 641 matching lines @@
           if (node.parent) {
             options.annotation.push(token);
             var count = node.parent.children.filter(function(child) {
               return node.role == child.role;
             }).length;
             this.append_(buff, String(count));
           }
         } else if (token == 'state') {
           options.annotation.push(token);
           Object.getOwnPropertyNames(node.state).forEach(function(s) {
-            var stateInfo = Output.STATE_INFO_[s];
-            if (stateInfo && stateInfo.on)
-              this.append_(buff, Msgs.getMsg(stateInfo.on.msgId), options);
+            this.append_(buff, s, options);
           }.bind(this));
         } else if (token == 'find') {
           // Find takes two arguments: JSON query string and format string.
           if (tree.firstChild) {
             var jsonQuery = tree.firstChild.value;
             node = node.find(
                 /** @type {Object}*/(JSON.parse(jsonQuery)));
             var formatString = tree.firstChild.nextSibling;
             if (node)
               this.format_(node, formatString, buff);
@@ skipping 203 matching lines @@
    * @param {!cursors.Range} range
    * @param {cursors.Range} prevRange
    * @param {EventType|Output.EventType} type
    * @param {!Array<Spannable>} rangeBuff
    * @private
    */
   range_: function(range, prevRange, type, rangeBuff) {
     if (!range.start.node || !range.end.node)
       return;
 
-    if (!prevRange && range.start.node.root)
+    if (!prevRange)
       prevRange = cursors.Range.fromNode(range.start.node.root);
     var cursor = cursors.Cursor.fromNode(range.start.node);
     var prevNode = prevRange.start.node;
 
     var formatNodeAndAncestors = function(node, prevNode) {
       var buff = [];
       var outputContextFirst = localStorage['outputContextFirst'] == 'true';
       if (outputContextFirst)
         this.ancestry_(node, prevNode, type, buff);
       this.node_(node, prevNode, type, buff);
@@ skipping 336 matching lines @@
           break;
         }
         earconFinder = earconFinder.parent;
       }
     }
     return null;
   }
 };
 
 });  // goog.scope