Use category flush for focus events.

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 158 matching lines @@
    */
   onEventIfSelected: function(evt) {
     if (evt.target.state.selected)
       this.onEventDefault(evt);
   },
 
   /**
    * @param {!AutomationEvent} evt
    */
   onEventWithFlushedOutput: function(evt) {
-    Output.flushNextSpeechUtterance();
+    Output.forceModeForNextSpeechUtterance(cvox.QueueMode.FLUSH);
     this.onEventDefault(evt);
   },
 
   /**
    * @param {!AutomationEvent} evt
    */
   onHover: function(evt) {
     if (ChromeVoxState.instance.currentRange &&
         evt.target == ChromeVoxState.instance.currentRange.start.node)
       return;
-    Output.flushNextSpeechUtterance();
+    Output.forceModeForNextSpeechUtterance(cvox.QueueMode.FLUSH);
     this.onEventDefault(evt);
   },
 
   /**
    * Makes an announcement without changing focus.
    * @param {!AutomationEvent} evt
    */
   onActiveDescendantChanged: function(evt) {
     if (!evt.target.activeDescendant || !evt.target.state.focused)
       return;
@@ skipping 43 matching lines @@
     this.textEditHandler_ = null;
 
     var node = evt.target;
 
     // Discard focus events on embeddedObject and client nodes.
     if (node.role == RoleType.embeddedObject || node.role == RoleType.client)
       return;
 
     this.createTextEditHandlerIfNeeded_(evt.target);
 
-    // Since we queue output mostly for live regions support and there isn't a
-    // reliable way to know if this focus event resulted from a user's explicit
-    // action, only flush when the focused node is not web content.
-    if (node.root.role == RoleType.desktop)
-      Output.flushNextSpeechUtterance();
-
+    // Category flush speech triggered by events with no source. This includes
+    // views.
+    if (evt.eventFrom == '')
+      Output.forceModeForNextSpeechUtterance(cvox.QueueMode.CATEGORY_FLUSH);
     this.onEventDefault(new chrome.automation.AutomationEvent(
         EventType.focus, node, evt.eventFrom));
   },
 
   /**
    * Provides all feedback once a load complete event fires.
    * @param {!AutomationEvent} evt
    */
   onLoadComplete: function(evt) {
     // Don't process nodes inside of web content if ChromeVox Next is inactive.
@@ skipping 147 matching lines @@
   /**
    * @param {!AutomationEvent} evt
    */
   onSelection: function(evt) {
     chrome.automation.getFocus(function(focus) {
       // Some cases (e.g. in overview mode), require overriding the assumption
       // that focus is an ancestor of a selection target.
       var override = evt.target.role == RoleType.menuItem ||
           (evt.target.root == focus.root &&
               focus.root.role == RoleType.desktop);
-      Output.flushNextSpeechUtterance();
+      Output.forceModeForNextSpeechUtterance(cvox.QueueMode.FLUSH);
       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) {
@@ skipping 29 matching lines @@
 DesktopAutomationHandler.init_ = function() {
   chrome.automation.getDesktop(function(desktop) {
     ChromeVoxState.desktopAutomationHandler =
         new DesktopAutomationHandler(desktop);
   });
 };
 
 DesktopAutomationHandler.init_();
 
 });  // goog.scope