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

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.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 The entry point for all ChromeVox2 related code for the
  * background page.
  */
 
 goog.provide('Background');
@@ skipping 68 matching lines @@
       this[func] = this[func].bind(this);
   }
 
   /**
    * Maps an automation event to its listener.
    * @type {!Object.<EventType, function(Object) : void>}
    */
   this.listeners_ = {
     alert: this.onEventDefault,
     focus: this.onEventDefault,
-    hover: this.onEventDefault,
     menuStart: this.onEventDefault,
     menuEnd: this.onEventDefault,
     loadComplete: this.onLoadComplete,
-    textChanged: this.onTextOrTextSelectionChanged,
-    textSelectionChanged: this.onTextOrTextSelectionChanged,
-    valueChanged: this.onEventDefault
+    textSelectionChanged: this.onTextSelectionChanged
   };
 
   // Register listeners for ...
   // Desktop.
   chrome.automation.getDesktop(this.onGotTree);
 
   // Tabs.
   chrome.tabs.onUpdated.addListener(this.onTabUpdated);
+
+  // Commands.
+  chrome.commands.onCommand.addListener(this.onGotCommand);
 };
 
 Background.prototype = {
   /**
    * Handles chrome.tabs.onUpdated.
    * @param {number} tabId
    * @param {Object} changeInfo
    */
   onTabUpdated: function(tabId, changeInfo) {
     if (changeInfo.status != 'complete')
       return;
     chrome.tabs.get(tabId, function(tab) {
       if (!tab.url)
         return;
 
       var next = this.isWhitelisted_(tab.url);
-
-      // Only care about Next for now.
-      if (!next)
-        return;
-
       this.toggleChromeVoxVersion({next: next, classic: !next});
     }.bind(this));
   },
 
   /**
    * Handles all setup once a new automation tree appears.
    * @param {chrome.automation.AutomationNode} root
    */
   onGotTree: function(root) {
     // Register all automation event listeners.
@@ skipping 102 matching lines @@
       new Output(this.currentRange_, prevRange, Output.EventType.NAVIGATE);
     }
   },
 
   /**
    * Provides all feedback once ChromeVox's focus changes.
    * @param {Object} evt
    */
   onEventDefault: function(evt) {
     var node = evt.target;
-
     if (!node)
       return;
 
     var prevRange = this.currentRange_;
     this.currentRange_ = cursors.Range.fromNode(node);
-
-    // Don't process nodes inside of web content if ChromeVox Next is inactive.
-    if (node.root.role != chrome.automation.RoleType.desktop && !this.active_)
-      return;
-
     new Output(this.currentRange_, prevRange, evt.type);
   },
 
   /**
    * Provides all feedback once a load complete event fires.
    * @param {Object} evt
    */
   onLoadComplete: function(evt) {
     var node = AutomationUtil.findNodePost(evt.target,
         Dir.FORWARD,
         AutomationPredicate.leaf);
     if (node)
       this.currentRange_ = cursors.Range.fromNode(node);
 
     if (this.currentRange_)
       new Output(this.currentRange_, null, evt.type);
   },
 
   /**
    * Provides all feedback once a text selection change event fires.
    * @param {Object} evt
    */
-  onTextOrTextSelectionChanged: function(evt) {
-    if (!this.currentRange_) {
-      if (!evt.target.state.focused)
-        return;
-
-      this.onEventDefault(evt);
+  onTextSelectionChanged: function(evt) {
+    if (!this.currentRange_)
       this.currentRange_ = cursors.Range.fromNode(evt.target);
-    }
 
     var textChangeEvent = new cvox.TextChangeEvent(
         evt.target.attributes.value,
         evt.target.attributes.textSelStart,
         evt.target.attributes.textSelEnd,
         true);  // triggered by user
     if (!this.editableTextHandler ||
         evt.target != this.currentRange_.getStart().getNode()) {
       this.editableTextHandler =
           new cvox.ChromeVoxEditableTextBase(
               textChangeEvent.value,
               textChangeEvent.start,
               textChangeEvent.end,
               evt.target.state['protected'],
               cvox.ChromeVox.tts);
     }
 
     this.editableTextHandler.changed(textChangeEvent);
-    new Output(this.currentRange_, null, evt.type, {braille: true});
   },
 
   /**
    * @private
    * @param {string} url
    * @return {boolean} Whether the given |url| is whitelisted.
    */
   isWhitelisted_: function(url) {
     return this.whitelist_.some(function(item) {
       return url.indexOf(item) != -1;
@@ skipping 16 matching lines @@
    * @param {{classic: boolean, next: boolean}=} opt_options Forceably set.
   */
   toggleChromeVoxVersion: function(opt_options) {
     if (!opt_options) {
       opt_options = {};
       opt_options.next = !this.active_;
       opt_options.classic = !opt_options.next;
     }
 
     if (opt_options.next) {
-      if (!chrome.commands.onCommand.hasListener(this.onGotCommand))
-        chrome.commands.onCommand.addListener(this.onGotCommand);
-
-      if (!this.active_)
-        chrome.automation.getTree(this.onGotTree);
+      chrome.automation.getTree(this.onGotTree);
       this.active_ = true;
     } else {
-      if (chrome.commands.onCommand.hasListener(this.onGotCommand))
-        chrome.commands.onCommand.removeListener(this.onGotCommand);
-
       if (this.active_) {
         for (var eventType in this.listeners_) {
           this.currentRange_.getStart().getNode().root.removeEventListener(
               eventType, this.listeners_[eventType], true);
         }
       }
       this.active_ = false;
     }
 
     chrome.tabs.query({active: true}, function(tabs) {
       if (opt_options.classic) {
         cvox.ChromeVox.injectChromeVoxIntoTabs(tabs);
       } else {
         tabs.forEach(function(tab) {
           this.disableClassicChromeVox_(tab.id);
         }.bind(this));
       }
     }.bind(this));
   }
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope