Keep track of accessibility focus across 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 108 matching lines @@
   cvox.ChromeVoxKbHandler.commandHandler = this.onGotCommand.bind(this);
 
   // Classic keymap.
   cvox.ChromeVoxKbHandler.handlerKeyMap = cvox.KeyMap.fromDefaults();
 
   // Live region handler.
   this.liveRegions_ = new LiveRegions(this);
 
   if (!chrome.accessibilityPrivate.setKeyboardListener)
     chrome.accessibilityPrivate.setKeyboardListener = function() {};
+
+  var focus = chrome.automation.getFocus();
+  if (focus)
+    this.setCurrentRange(cursors.Range.fromNode(focus));
 };
 
 Background.prototype = {
   __proto__: ChromeVoxState.prototype,
 
   /**
    * @override
    */
   getMode: function() {
     return this.mode_;
@@ skipping 44 matching lines @@
     }.bind(this));
 
     // If switching out of a ChromeVox Next mode, make sure we cancel
     // the progress loading sound just in case.
     if ((this.mode_ === ChromeVoxMode.NEXT ||
          this.mode_ === ChromeVoxMode.FORCE_NEXT) &&
         this.mode_ != mode) {
       cvox.ChromeVox.earcons.cancelEarcon(cvox.Earcon.PAGE_START_LOADING);
     }
 
+    // If switching to Classic from any automation-API-based mode,
+    // clear the focus ring.
+    if (mode === ChromeVoxMode.CLASSIC && mode != this.mode_) {
+      if (cvox.ChromeVox.isChromeOS)
+        chrome.accessibilityPrivate.setFocusRing([]);
+    }
+
+    // If switching away from Classic to any automation-API-based mode,
+    // update the range based on what's focused.
+    if (this.mode_ === ChromeVoxMode.CLASSIC && mode != this.mode_) {
+      var focus = chrome.automation.getFocus();
+      if (focus)
+        this.setCurrentRange(cursors.Range.fromNode(focus));
+    }
+
     this.mode_ = mode;
   },
 
   /**
    * Mode refreshes takes into account both |url| and the current ChromeVox
    *    range. The latter gets used to decide if the user is or isn't in web
    *    content. The focused state also needs to be set for this info to be
    *    reliable.
    * @override
    */
@@ skipping 255 matching lines @@
           newMode = ChromeVoxMode.FORCE_NEXT;
         }
         this.setMode(newMode, true);
 
         var isClassic =
             newMode == ChromeVoxMode.CLASSIC || newMode == ChromeVoxMode.COMPAT;
 
         // Leaving unlocalized as 'next' isn't an official name.
         cvox.ChromeVox.tts.speak(isClassic ?
             'classic' : 'next', cvox.QueueMode.FLUSH, {doNotInterrupt: true});
+
+        // If the new mode is Classic, return now so we don't announce

[David Tseng, 2016/01/28 02:00:56]

Maybe add something to queue the next utterance?

[dmazzoni, 2016/01/30 00:02:41]

For Classic? Did you have something specific in mind? I'm not sure how to do
this and I'd rather not spend time on improving Classic.

Right now the experience is that switching to Next says "Next", followed by
whatever has focus, and switching to Classic just says "Classic" and doesn't
currently announce anything.

+        // anything more.
+        if (newMode == ChromeVoxMode.CLASSIC)
+          return false;
+

[David Tseng, 2016/01/28 02:00:56]

nit: extra line

[dmazzoni, 2016/01/30 00:02:41]

Done.

         break;
       case 'toggleStickyMode':
         cvox.ChromeVoxBackground.setPref('sticky',
                                          !cvox.ChromeVox.isStickyPrefOn,
                                          true);
 
         if (cvox.ChromeVox.isStickyPrefOn)
           chrome.accessibilityPrivate.setKeyboardListener(true, true);
         else
           chrome.accessibilityPrivate.setKeyboardListener(true, false);
@@ skipping 217 matching lines @@
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope