Revert of Various changes required to support ChromeVox Next to read Views and Windows.

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 23 matching lines @@
  *     For example, $value $role $enabled
  * @ prefix: used to substitute a message. Note the ability to specify params to
  *     the message.  For example, '@tag_html' '@selected_index($text_sel_start,
  *     $text_sel_end').
  * = suffix: used to specify substitution only if not previously appended.
  *     For example, $name= would insert the name attribute only if no name
  * attribute had been inserted previously.
  * @param {!cursors.Range} range
  * @param {cursors.Range} prevRange
  * @param {chrome.automation.EventType|Output.EventType} type
- * @param {{braille: (boolean|undefined), speech: (boolean|undefined)}=}
- *     opt_options
  * @constructor
  */
-Output = function(range, prevRange, type, opt_options) {
-  opt_options = opt_options || {braille: true, speech: true};
+Output = function(range, prevRange, type) {
   // TODO(dtseng): Include braille specific rules.
   /** @type {!cvox.Spannable} */
   this.buffer_ = new cvox.Spannable();
   /** @type {!cvox.Spannable} */
   this.brailleBuffer_ = new cvox.Spannable();
   /** @type {!Array.<Object>} */
   this.locations_ = [];
 
   /**
    * Current global options.
    * @type {{speech: boolean, braille: boolean, location: boolean}}
    */
   this.formatOptions_ = {speech: true, braille: false, location: true};
 
   this.render_(range, prevRange, type);
-  if (opt_options.speech)
-    this.handleSpeech();
-  if (opt_options.braille)
-    this.handleBraille();
+  this.handleSpeech();
+  this.handleBraille();
   this.handleDisplay();
 };
 
 /**
  * Delimiter to use between output values.
  * @type {string}
  */
 Output.SPACE = ' ';
 
 /**
@@ skipping 12 matching lines @@
     button: {
       speak: '$name $earcon(BUTTON, @tag_button)'
     },
     checkBox: {
       speak: '$or($checked, @describe_checkbox_checked($name), ' +
           '@describe_checkbox_unchecked($name)) ' +
           '$or($checked, ' +
               '$earcon(CHECK_ON, @input_type_checkbox), ' +
               '$earcon(CHECK_OFF, @input_type_checkbox))'
     },
-    dialog: {
-      enter: '$name $role'
-    },
     heading: {
       enter: '@aria_role_heading',
       speak: '@aria_role_heading $name='
     },
     inlineTextBox: {
       speak: '$value='
     },
     link: {
       enter: '$name= $visited $earcon(LINK, @tag_link)=',
       stay: '$name= $visited @tag_link',
@@ skipping 34 matching lines @@
     },
     textBox: {
       speak: '$name $value $earcon(EDITABLE_TEXT, @input_type_text)'
     },
     tab: {
       speak: '@describe_tab($name)'
     },
     textField: {
       speak: '$name $value $earcon(EDITABLE_TEXT, @input_type_text)'
     },
-    toolbar: {
-      enter: '$name $role'
-    },
     window: {
-      enter: '$name',
       speak: '@describe_window($name) $earcon(OBJECT_OPEN)'
     }
   },
   menuStart: {
     'default': {
       speak: '@chrome_menu_opened($name) $role $earcon(OBJECT_OPEN)'
     }
   },
     menuEnd: {
     'default': {
@@ skipping 224 matching lines @@
 
   /**
    * @param {!cursors.Range} range
    * @param {cursors.Range} prevRange
    * @param {chrome.automation.EventType|string} type
    * @param {!cvox.Spannable} rangeBuff
    * @private
    */
   range_: function(range, prevRange, type, rangeBuff) {
     if (!prevRange)
-      prevRange = cursors.Range.fromNode(range.getStart().getNode().root);
+      prevRange = range;
 
     var cursor = range.getStart();
     var prevNode = prevRange.getStart().getNode();
 
     var formatNodeAndAncestors = function(node, prevNode) {
       var buff = new cvox.Spannable();
       this.ancestry_(node, prevNode, type, buff);
       this.node_(node, prevNode, type, buff);
       if (this.formatOptions_.location)
         this.locations_.push(node.location);
@@ skipping 155 matching lines @@
     }
 
     if (currentNode != root)
       throw 'Unbalanced parenthesis.';
 
     return root;
   }
 };
 
 });  // goog.scope