Add role lists to ChromeVox.

chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.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 The ChromeVox panel and menus.
  */
 
 goog.provide('Panel');
 
@@ skipping 167 matching lines @@
       this.brailleTextElement_.textContent = command.data.text;
       this.brailleCellsElement_.textContent = command.data.braille;
       break;
     case PanelCommandType.ENABLE_MENUS:
       Panel.onEnableMenus();
       break;
     case PanelCommandType.DISABLE_MENUS:
       Panel.onDisableMenus();
       break;
     case PanelCommandType.OPEN_MENUS:
-      Panel.onOpenMenus();
+      Panel.onOpenMenus(undefined, command.data);
       break;
     case PanelCommandType.SEARCH:
       Panel.onSearch();
       break;
   }
 };
 
 /**
  * Enable the ChromeVox Menus.
  */
 Panel.onEnableMenus = function() {
   Panel.menusEnabled_ = true;
   $('menus_button').disabled = false;
   $('triangle').style.display = '';
 };
 
 /**
  * Disable the ChromeVox Menus.
  */
 Panel.onDisableMenus = function() {
   Panel.menusEnabled_ = false;
   $('menus_button').disabled = true;
   $('triangle').style.display = 'none';
 };
 
 /**
  * Open / show the ChromeVox Menus.
  * @param {Event=} opt_event An optional event that triggered this.
+ * @param {*=} opt_activateMenuTitle Title msg id of menu to open.
  */
-Panel.onOpenMenus = function(opt_event) {
+Panel.onOpenMenus = function(opt_event, opt_activateMenuTitle) {
   // Don't open the menu if it's not enabled, such as when ChromeVox Next
   // is not active.
   if (!Panel.menusEnabled_)
     return;
 
   // Eat the event so that a mousedown isn't turned into a drag, allowing
   // users to click-drag-release to select a menu item.
   if (opt_event) {
     opt_event.stopPropagation();
     opt_event.preventDefault();
   }
 
   // Change the url fragment to 'fullscreen', which signals the native
   // host code to make the window fullscreen, revealing the menus.
   window.location = '#fullscreen';
 
   // Clear any existing menus and clear the callback.
   Panel.clearMenus();
   Panel.pendingCallback_ = null;
 
   // Build the top-level menus.
-  var jumpMenu = Panel.addMenu('Jump');
-  var speechMenu = Panel.addMenu('Speech');
-  var tabsMenu = Panel.addMenu('Tabs');
-  var chromevoxMenu = Panel.addMenu('ChromeVox');
+  var jumpMenu = Panel.addMenu('panel_menu_jump');
+  var speechMenu = Panel.addMenu('panel_menu_speech');
+  var tabsMenu = Panel.addMenu('panel_menu_tabs');
+  var chromevoxMenu = Panel.addMenu('panel_menu_chromevox');
 
   // Create a mapping between categories from CommandStore, and our
   // top-level menus. Some categories aren't mapped to any menu.
   var categoryToMenu = {
     'navigation': jumpMenu,
     'jump_commands': jumpMenu,
     'controlling_speech': speechMenu,
     'modifier_keys': chromevoxMenu,
     'help_commands': chromevoxMenu,
 
@@ skipping 65 matching lines @@
       }
     });
   });
 
   // Add a menu item that disables / closes ChromeVox.
   chromevoxMenu.addMenuItem(
       Msgs.getMsg('disable_chromevox'), 'Ctrl+Alt+Z', function() {
         Panel.onClose();
       });
 
-  // Activate the first menu.
-  Panel.activateMenu(Panel.menus_[0]);
+  // Add menus for various role types.
+  var node = bkgnd.ChromeVoxState.instance.getCurrentRange().start.node;
+  Panel.addNodeMenu('role_heading', node, AutomationPredicate.heading);
+  Panel.addNodeMenu('role_landmark', node, AutomationPredicate.landmark);
+  Panel.addNodeMenu('role_link', node, AutomationPredicate.link);
+  Panel.addNodeMenu('role_form', node, AutomationPredicate.formField);
+  Panel.addNodeMenu('table_strategy', node, AutomationPredicate.table);

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

Is this just because 'table_strategy' already exists? I'd prefer if you just
call it 'role_table' and add a new string, or alternatively add a little system
for synonym strings. I'd just prefer for this code to be more clear.

Same for the keymap file where you used 'table_strategy'.

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

Done.

+
+  // Activate either the specified menu or the first menu.
+  var selectedMenu = Panel.menus_[0];
+  for (var i = 0; i < Panel.menus_.length; i++) {
+    if (this.menus_[i].menuMsg == opt_activateMenuTitle)
+      selectedMenu = this.menus_[i];
+  }
+  Panel.activateMenu(selectedMenu);
 };
 
 /** Open incremental search. */
 Panel.onSearch = function() {
   Panel.clearMenus();
   Panel.pendingCallback_ = null;
   Panel.searching_ = true;
   Panel.updateFromPrefs();
 
   window.location = '#focus';
 
   ISearchUI.get(Panel.searchInput_);
 };
 
 /**
  * Clear any previous menus. The menus are all regenerated each time the
  * menus are opened.
  */
 Panel.clearMenus = function() {
   while (this.menus_.length) {
     var menu = this.menus_.pop();
     $('menu-bar').removeChild(menu.menuBarItemElement);
     $('menus_background').removeChild(menu.menuContainerElement);
   }
   this.activeMenu_ = null;
 };
 
 /**
  * Create a new menu with the given name and add it to the menu bar.
- * @param {string} menuTitle The title of the new menu to add.
+ * @param {string} menuMsg The msg id of the new menu to add.
  * @return {PanelMenu} The menu just created.
  */
-Panel.addMenu = function(menuTitle) {
-  var menu = new PanelMenu(menuTitle);
+Panel.addMenu = function(menuMsg) {
+  var menu = new PanelMenu(menuMsg);
   $('menu-bar').appendChild(menu.menuBarItemElement);
   menu.menuBarItemElement.addEventListener('mouseover', function() {
     Panel.activateMenu(menu);
+  }, false);
+
+  $('menus_background').appendChild(menu.menuContainerElement);
+  this.menus_.push(menu);
+  return menu;
+};
+
+
+/**
+ * Create a new node menu with the given name and add it to the menu bar.
+ * @param {string} menuMsg The msg id of the new menu to add.
+ * @param {chrome.automation.AutomationNode} node
+ * @param {AutomationPredicate.Unary} pred
+ * @return {PanelMenu} The menu just created.
+ */
+Panel.addNodeMenu = function(menuMsg, node, pred) {
+  var menu = new PanelNodeMenu(menuMsg, node, pred);
+  $('menu-bar').appendChild(menu.menuBarItemElement);
+  menu.menuBarItemElement.addEventListener('mouseover', function() {
+    Panel.activateMenu(menu);
   }, false);
 
   $('menus_background').appendChild(menu.menuContainerElement);
   this.menus_.push(menu);
   return menu;
 };
 
 /**
  * Activate a menu, which implies hiding the previous active menu.
  * @param {PanelMenu} menu The new menu to activate.
@@ skipping 157 matching lines @@
 /**
  * Close the menus and restore focus to the page. If a menu item's callback
  * was queued, execute it once focus is restored.
  */
 Panel.closeMenusAndRestoreFocus = function() {
   // Make sure we're not in full-screen mode.
   window.location = '#';
 
   var bkgnd =
       chrome.extension.getBackgroundPage()['global']['backgroundObj'];
-  bkgnd['endExcursion']();
-  if (Panel.pendingCallback_)
-    Panel.pendingCallback_();
+  bkgnd['endExcursion'](Panel.pendingCallback_);
 };
 
 window.addEventListener('load', function() {
   Panel.init();
 }, false);
 
 window.addEventListener('hashchange', function() {
   if (location.hash == '#fullscreen' || location.hash == '#focus') {
     this.originalStickyState_ = cvox.ChromeVox.isStickyPrefOn;
     cvox.ChromeVox.isStickyPrefOn = false;
   } else {
     cvox.ChromeVox.isStickyPrefOn = this.originalStickyState_;
   }
 }, false);