Add role lists to ChromeVox.

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 620 matching lines @@
         if (cvox.ChromeVox.isStickyPrefOn)
           chrome.accessibilityPrivate.setKeyboardListener(true, true);
         else
           chrome.accessibilityPrivate.setKeyboardListener(true, false);
         return false;
       case 'passThroughMode':
         cvox.ChromeVox.passThroughMode = true;
         cvox.ChromeVox.tts.speak(
             Msgs.getMsg('pass_through_key'), cvox.QueueMode.QUEUE);
         return true;
-      case 'openChromeVoxMenus':
+      case 'toggleKeyboardHelp':
         this.startExcursion();
         (new PanelCommand(PanelCommandType.OPEN_MENUS)).send();
         return false;
+      case 'showHeadingsList':
+        this.startExcursion();
+        (new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_heading')).send();
+        return false;
+      case 'showFormsList':
+        this.startExcursion();
+        (new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_form')).send();
+        return false;
+      case 'showLandmarksList':
+        this.startExcursion();
+        (new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_landmark')).send();
+        return false;
+      case 'showLinksList':
+        this.startExcursion();
+        (new PanelCommand(PanelCommandType.OPEN_MENUS, 'role_link')).send();
+        return false;
+      case 'showTablesList':
+        this.startExcursion();
+        (new PanelCommand(PanelCommandType.OPEN_MENUS, 'table_strategy'))
+            .send();
+        return false;
       case 'toggleSearchWidget':
         (new PanelCommand(PanelCommandType.SEARCH)).send();
         return false;
       case 'showKbExplorerPage':
         var explorerPage = {url: 'chromevox/background/kbexplorer.html'};
         chrome.tabs.create(explorerPage);
         break;
       case 'decreaseTtsRate':
         this.increaseOrDecreaseSpeechProperty_(cvox.AbstractTts.RATE, false);
         return false;
@@ skipping 127 matching lines @@
       } else {
         if (predErrorMsg) {
           cvox.ChromeVox.tts.speak(Msgs.getMsg(predErrorMsg),
                                    cvox.QueueMode.FLUSH);
         }
         return false;
       }
     }
 
     if (current)
-      this.navigateToRange_(current);
+      this.navigateToRange(current);
 
     return false;
   },
 
   /**
    * Increase or decrease a speech property and make an announcement.
    * @param {string} propertyName The name of the property to change.
    * @param {boolean} increase If true, increases the property value by one
    *     step size, otherwise decreases.
    */
@@ skipping 16 matching lines @@
     if (announcement) {
       cvox.ChromeVox.tts.speak(
           announcement, cvox.QueueMode.FLUSH,
           cvox.AbstractTts.PERSONALITY_ANNOTATION);
     }
   },
 
   /**
    * Navigate to the given range - it both sets the range and outputs it.
    * @param {!cursors.Range} range The new range.
+   * @param {boolean=} opt_focus Focus the range; defaults to true.
    * @private
    */
-  navigateToRange_: function(range) {
-    // TODO(dtseng): Figure out what it means to focus a range.
-    var actionNode = range.start.node;
-    if (actionNode.role == RoleType.inlineTextBox)
-      actionNode = actionNode.parent;
+  navigateToRange: function(range, opt_focus) {
+    opt_focus = opt_focus === undefined ? true : opt_focus;
 
-    // Iframes, when focused, causes the child webArea to fire focus event.
-    // This can result in getting stuck when navigating backward.
-    if (actionNode.role != RoleType.iframe && !actionNode.state.focused &&
-        !AutomationPredicate.container(actionNode))
-      actionNode.focus();
+    if (opt_focus) {
+      // TODO(dtseng): Figure out what it means to focus a range.
+      var actionNode = range.start.node;
+      if (actionNode.role == RoleType.inlineTextBox)
+        actionNode = actionNode.parent;
 
+      // Iframes, when focused, causes the child webArea to fire focus event.
+      // This can result in getting stuck when navigating backward.
+      if (actionNode.role != RoleType.iframe && !actionNode.state.focused &&
+          !AutomationPredicate.container(actionNode))
+        actionNode.focus();
+    }
     var prevRange = this.currentRange_;
     this.setCurrentRange(range);
 
     range.select();
 
     new Output().withRichSpeechAndBraille(
         range, prevRange, Output.EventType.NAVIGATE)
         .withQueueMode(cvox.QueueMode.FLUSH)
         .go();
   },
@@ skipping 180 matching lines @@
         } else if (action == 'flushNextUtterance') {
           Output.flushNextSpeechUtterance();
         }
         break;
     }
   },
 
   /**
    * Restore the range to the last range that was *not* in the ChromeVox
    * panel. This is used when the ChromeVox Panel closes.
+ * @param {function()=} opt_callback

[dmazzoni, 2016/06/07 16:36:06]

nit: indentation

[David Tseng, 2016/06/08 19:28:33]

Done.

    * @private
    */
-  restoreCurrentRange_: function() {
+  restoreCurrentRange_: function(opt_callback) {
     if (this.savedRange_) {
       var node = this.savedRange_.start.node;
       var containingWebView = node;
       while (containingWebView && containingWebView.role != RoleType.webView)
         containingWebView = containingWebView.parent;
 
       if (containingWebView) {
         // Focusing the webView causes a focus change event which steals focus
         // away from the saved range.
         var saved = this.savedRange_;
         var setSavedRange = function(e) {
-          if (e.target.root == saved.start.node.root)
-            this.navigateToRange_(saved);
+          if (e.target.root == saved.start.node.root) {
+          this.navigateToRange(saved, false);
+          opt_callback && opt_callback();
+        }
           node.root.removeEventListener(EventType.focus, setSavedRange, true);
         }.bind(this);
         node.root.addEventListener(EventType.focus, setSavedRange, true);
         containingWebView.focus();
       }
-      this.navigateToRange_(this.savedRange_);
+      this.navigateToRange(this.savedRange_);
       this.savedRange_ = null;
     }
   },
 
   /**
    * Move ChromeVox without saving any ranges.
    */
   startExcursion: function() {
     this.inExcursion_ = true;
   },
 
   /**
    * Move ChromeVox back to the last saved range.
+   * @param {function()=} opt_callback Called when range has been restored.
    */
-  endExcursion: function() {
+  endExcursion: function(opt_callback) {
     this.inExcursion_ = false;
-    this.restoreCurrentRange_();
+    this.restoreCurrentRange_(opt_callback);
   },
 
   /**
    * Move ChromeVox back to the last saved range.
    */
   saveExcursion: function() {
     this.savedRange_ =
         new cursors.Range(this.currentRange_.start, this.currentRange_.end);
   },
 
@@ skipping 51 matching lines @@
     return glob.replace(/[.+^$(){}|[\]\\]/g, '\\$&')
         .replace(/\*/g, '.*')
         .replace(/\?/g, '.');
   }).join('|') + ')$');
 };
 
 /** @type {Background} */
 global.backgroundObj = new Background();
 
 });  // goog.scope