Revert of Make ChromeVox Next a setting in options page.

chrome/browser/resources/chromeos/chromevox/cvox2/background/desktop_automation_handler.js

 // Copyright 2015 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 Handles automation from a desktop automation node.
  */
 
 goog.provide('DesktopAutomationHandler');
 
@@ skipping 80 matching lines @@
    */
   onEventDefault: function(evt) {
     var node = evt.target;
     if (!node)
       return;
 
     var prevRange = ChromeVoxState.instance.currentRange;
 
     ChromeVoxState.instance.setCurrentRange(cursors.Range.fromNode(node));
 
+    // Check to see if we've crossed roots. Continue if we've crossed roots or
+    // are not within web content.
+    if (node.root.role == RoleType.desktop ||
+        !prevRange ||
+        prevRange.start.node.root != node.root)
+      ChromeVoxState.instance.refreshMode(node.root);
+
     // Don't process nodes inside of web content if ChromeVox Next is inactive.
     if (node.root.role != RoleType.desktop &&
         ChromeVoxState.instance.mode === ChromeVoxMode.CLASSIC) {
       if (cvox.ChromeVox.isChromeOS)
         chrome.accessibilityPrivate.setFocusRing([]);
       return;
     }
 
     // Don't output if focused node hasn't changed.
     if (prevRange &&
@@ skipping 13 matching lines @@
     }
     output.go();
   },
 
   /**
    * @param {!AutomationEvent} evt
    */
   onEventIfInRange: function(evt) {
     // TODO(dtseng): Consider the end of the current range as well.
     if (AutomationUtil.isDescendantOf(
-        ChromeVoxState.instance.currentRange.start.node, evt.target) ||
+        global.backgroundObj.currentRange.start.node, evt.target) ||
             evt.target.state.focused)
       this.onEventDefault(evt);
   },
 
   /**
    * @param {!AutomationEvent} evt
    */
   onEventIfSelected: function(evt) {
     if (evt.target.state.selected)
       this.onEventDefault(evt);
@@ skipping 73 matching lines @@
 
     this.onEventDefault(
         new chrome.automation.AutomationEvent(EventType.focus, node));
   },
 
   /**
    * Provides all feedback once a load complete event fires.
    * @param {!AutomationEvent} evt
    */
   onLoadComplete: function(evt) {
+    ChromeVoxState.instance.refreshMode(evt.target);
+
     // Don't process nodes inside of web content if ChromeVox Next is inactive.
     if (evt.target.root.role != RoleType.desktop &&
         ChromeVoxState.instance.mode === ChromeVoxMode.CLASSIC)
       return;
 
     chrome.automation.getFocus(function(focus) {
       if (!focus || !AutomationUtil.isDescendantOf(focus, evt.target))
         return;
 
       // If initial focus was already placed on this page (e.g. if a user starts
@@ skipping 79 matching lines @@
 
     // Don't process nodes inside of web content if ChromeVox Next is inactive.
     if (evt.target.root.role != RoleType.desktop &&
         ChromeVoxState.instance.mode === ChromeVoxMode.CLASSIC)
       return;
 
     var t = evt.target;
     if (t.state.focused ||
         t.root.role == RoleType.desktop ||
         AutomationUtil.isDescendantOf(
-            ChromeVoxState.instance.currentRange.start.node, t)) {
+            global.backgroundObj.currentRange.start.node, t)) {
       if (new Date() - this.lastValueChanged_ <=
           DesktopAutomationHandler.VMIN_VALUE_CHANGE_DELAY_MS)
         return;
 
       this.lastValueChanged_ = new Date();
 
       new Output().format('$value', evt.target)
           .go();
     }
   },
@@ skipping 25 matching lines @@
       if (override || AutomationUtil.isDescendantOf(evt.target, focus))
         this.onEventDefault(evt);
     }.bind(this));
   },
 
   /**
    * Provides all feedback once a menu start event fires.
    * @param {!AutomationEvent} evt
    */
   onMenuStart: function(evt) {
-    ChromeVoxState.instance.startExcursion();
+    global.backgroundObj.startExcursion();
     this.onEventDefault(evt);
   },
 
   /**
    * Provides all feedback once a menu end event fires.
    * @param {!AutomationEvent} evt
    */
   onMenuEnd: function(evt) {
     this.onEventDefault(evt);
-    ChromeVoxState.instance.endExcursion();
+    global.backgroundObj.endExcursion();
   },
 
   /**
    * Create an editable text handler for the given node if needed.
    * @param {!AutomationNode} node
    */
   createTextEditHandlerIfNeeded_: function(node) {
     if (!this.textEditHandler_ ||
         this.textEditHandler_.node !== node) {
       this.textEditHandler_ = editing.TextEditHandler.createForNode(node);
     }
   }
 };
 
 /**
  * Initializes global state for DesktopAutomationHandler.
  * @private
  */
 DesktopAutomationHandler.init_ = function() {
   if (cvox.ChromeVox.isMac)
     return;
   chrome.automation.getDesktop(function(desktop) {
-    ChromeVoxState.desktopAutomationHandler =
-        new DesktopAutomationHandler(desktop);
+    global.desktopAutomationHandler = new DesktopAutomationHandler(desktop);
   });
 };
 
 DesktopAutomationHandler.init_();
 
 });  // goog.scope