Entering / exiting dialog notification should not interrupt live region.

chrome/browser/resources/chromeos/chromevox/chromevox/injected/event_watcher.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 Watches for events in the browser such as focus changes.
  *
  */
 
 goog.provide('cvox.ChromeVoxEventWatcher');
@@ skipping 1307 matching lines @@
   if (dialog == cvox.ChromeVox.navigationManager.currentDialog) {
     return false;
   }
 
   if (cvox.ChromeVox.navigationManager.currentDialog && !dialog) {
     if (!cvox.DomUtil.isDescendantOfNode(
         document.activeElement,
         cvox.ChromeVox.navigationManager.currentDialog)) {
       cvox.ChromeVox.navigationManager.currentDialog = null;
 
-      cvox.ChromeVox.tts.speak(
+      cvox.ChromeVoxEventWatcher.speakAnnotationWithCategory_(
           cvox.ChromeVox.msgs.getMsg('exiting_dialog'),
-          cvox.ChromeVoxEventWatcher.queueMode_(),
-          cvox.AbstractTts.PERSONALITY_ANNOTATION);
+          cvox.TtsCategory.NAV);
       return true;
     }
   } else {
     if (dialog) {
       cvox.ChromeVox.navigationManager.currentDialog = dialog;
-      cvox.ChromeVox.tts.speak(
+      cvox.ChromeVoxEventWatcher.speakAnnotationWithCategory_(
           cvox.ChromeVox.msgs.getMsg('entering_dialog'),
-          cvox.ChromeVoxEventWatcher.queueMode_(),
-          cvox.AbstractTts.PERSONALITY_ANNOTATION);
+          cvox.TtsCategory.NAV);
+
       if (role == 'alertdialog') {
         var dialogDescArray =
             cvox.DescriptionUtil.getFullDescriptionsFromChildren(null, dialog);
         var descSpeaker = new cvox.NavigationSpeaker();
         descSpeaker.speakDescriptionArray(dialogDescArray,
                                           cvox.AbstractTts.QUEUE_MODE_QUEUE,
                                           null);
       }
       return true;
     }
   }
   return false;
 };
 
 /**
+ * Speak the given text with the annotation personality and the given
+ * speech queue utterance category.
+ * @param {string} text The text to speak.
+ * @param {string} category The category of text, used by the speech queue
+ *     when flushing all speech from the same category while leaving other
+ *     speech in the queue.
+ * @private
+ */
+cvox.ChromeVoxEventWatcher.speakAnnotationWithCategory_ = function(
+    text, category) {
+  var properties = {};
+  var src = cvox.AbstractTts.PERSONALITY_ANNOTATION;
+  for (var key in src) {
+    properties[key] = src[key];
+  }
+  properties['category'] = category;
+  cvox.ChromeVox.tts.speak(
+      text,
+      cvox.ChromeVoxEventWatcher.queueMode_(),
+      properties);
+};
+
+/**
  * Returns true if we should wait to process events.
  * @param {number} lastFocusTimestamp The timestamp of the last focus event.
  * @param {number} firstTimestamp The timestamp of the first event.
  * @param {number} currentTime The current timestamp.
  * @return {boolean} True if we should wait to process events.
  */
 cvox.ChromeVoxEventWatcherUtil.shouldWaitToProcess = function(
     lastFocusTimestamp, firstTimestamp, currentTime) {
   var timeSinceFocusEvent = currentTime - lastFocusTimestamp;
   var timeSinceFirstEvent = currentTime - firstTimestamp;
@@ skipping 218 matching lines @@
       ((currentFocus.type == 'date') ||
       (currentFocus.type == 'month') ||
       (currentFocus.type == 'week'))) {
     cvox.ChromeVoxEventWatcher.currentDateHandler =
         new cvox.ChromeVoxHTMLDateWidget(currentFocus, cvox.ChromeVox.tts);
     } else {
       cvox.ChromeVoxEventWatcher.currentDateHandler = null;
     }
   return (null != cvox.ChromeVoxEventWatcher.currentDateHandler);
 };