Select menu items when moving by object

Bug: 539022
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I2e8f9b364e380b8c3200f6674b0ecea859adba01
Reviewed-on: https://chromium-review.googlesource.com/951854
Commit-Queue: David Tseng <dtseng@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543184}

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

@@ -544,6 +544,11 @@ Background.prototype = {
           AutomationPredicate.linkOrControl(node);
     };
 
+    // Always try to give nodes selection.
+    if (start.defaultActionVerb == chrome.automation.DefaultActionVerb.SELECT) {
+      start.doDefault();
+    }
+
     // Next, try to focus the start or end node.
     if (!AutomationPredicate.structuralContainer(start) &&
         start.state[StateType.FOCUSABLE]) {

chrome/browser/resources/chromeos/chromevox/cvox2/background/background_test.extjs

@@ -1521,3 +1521,20 @@ TEST_F('BackgroundTest', 'NavigationEscapesEdit', function() {
         .replay();
   });
 });
+
+TEST_F('BackgroundTest', 'NavigationSyncsSelect', function() {
+  var mockFeedback = this.createMockFeedback();
+  this.runWithLoadedTree(function() {/*!
+    <select>
+      <option>apple</option>
+      <option>grape</option>
+    </select>
+  */}, function(root) {
+    var select = root.find({role: RoleType.POP_UP_BUTTON});
+    mockFeedback.call(select.doDefault.bind(select))
+        .expectSpeech('apple', 'Selected')
+        .call(doCmd('nextObject'))
+        .expectSpeech('grape', 'Selected')
+        .replay();
+  });
+});

chrome/common/extensions/api/automation.idl

@@ -279,6 +279,19 @@
     readOnly
   };
 
+  // Describes possible actions when performing a do default action.
+  enum DefaultActionVerb {
+    activate,
+    check,
+    click,
+    clickAncestor,
+    jump,
+    open,
+    press,
+    select,
+    uncheck
+};
+
   dictionary Rect {
     long left;
     long top;
@@ -494,6 +507,9 @@
     // An array of custom actions.
     CustomAction[]? customActions;
 
+    // The action taken by calling <code>doDefault</code>.
+    DefaultActionVerb? defaultActionVerb;
+
     //
     // Link attributes.
     //

chrome/renderer/extensions/automation_internal_custom_bindings.cc

@@ -868,6 +868,18 @@ void AutomationInternalCustomBindings::AddRoutes() {
           result.Set(v8::String::NewFromUtf8(isolate, restriction_str.c_str()));
         }
       });
+  RouteNodeIDFunction(
+      "GetDefaultActionVerb",
+      [](v8::Isolate* isolate, v8::ReturnValue<v8::Value> result,
+         AutomationAXTreeWrapper* tree_wrapper, ui::AXNode* node) {
+        ax::mojom::DefaultActionVerb default_action_verb =
+            static_cast<ax::mojom::DefaultActionVerb>(
+                node->data().GetIntAttribute(
+                    ax::mojom::IntAttribute::kDefaultActionVerb));
+        std::string default_action_verb_str = ui::ToString(default_action_verb);
+        result.Set(
+            v8::String::NewFromUtf8(isolate, default_action_verb_str.c_str()));
+      });
 }
 
 void AutomationInternalCustomBindings::Invalidate() {

chrome/renderer/resources/extensions/automation/automation_node.js

@@ -314,6 +314,13 @@ var GetLineThrough = natives.GetLineThrough;
  */
 var GetCustomActions = natives.GetCustomActions;
 
+/**
+ * @param {number} axTreeID The id of the accessibility tree.
+ * @param {number} nodeID The id of a node.
+ * @return {automation.NameFromType} The source of the node's name.
+ */
+var GetDefaultActionVerb = natives.GetDefaultActionVerb;
+
 var logging = requireNative('logging');
 var utils = require('utils');
 
@@ -486,6 +493,10 @@ AutomationNodeImpl.prototype = {
     return GetCustomActions(this.treeID, this.id);
   },
 
+  get defaultActionVerb() {
+    return GetDefaultActionVerb(this.treeID, this.id);
+  },
+
   doDefault: function() {
     this.performAction_('doDefault');
   },
@@ -1360,6 +1371,7 @@ utils.expose(AutomationNode, AutomationNodeImpl, {
       'isRootNode',
       'role',
       'checked',
+      'defaultActionVerb',
       'restriction',
       'state',
       'location',

third_party/closure_compiler/externs/automation.js

@@ -274,6 +274,22 @@ chrome.automation.Restriction = {
   READ_ONLY: 'readOnly',
 };
 
+/**
+ * @enum {string}
+ * @see https://developer.chrome.com/extensions/automation#type-DefaultActionVerb
+ */
+chrome.automation.DefaultActionVerb = {
+  ACTIVATE: 'activate',
+  CHECK: 'check',
+  CLICK: 'click',
+  CLICK_ANCESTOR: 'clickAncestor',
+  JUMP: 'jump',
+  OPEN: 'open',
+  PRESS: 'press',
+  SELECT: 'select',
+  UNCHECK: 'uncheck',
+};
+
 /**
  * @typedef {{
  *   left: number,
@@ -618,6 +634,13 @@ chrome.automation.AutomationNode.prototype.labelFor;
  */
 chrome.automation.AutomationNode.prototype.customActions;
 
+/**
+ * The action taken by calling <code>doDefault</code>.
+ * @type {(!chrome.automation.DefaultActionVerb|undefined)}
+ * @see https://developer.chrome.com/extensions/automation#type-defaultActionVerb
+ */
+chrome.automation.AutomationNode.prototype.defaultActionVerb;
+
 /**
  * The URL that this link will navigate to.
  * @type {(string|undefined)}

ui/accessibility/PRESUBMIT.py

@@ -121,6 +121,8 @@ def CheckEnumsMatch(input_api, output_api):
                     errs, output_api)
   CheckMatchingEnum(ax_enums, 'Restriction', automation_enums,
                    'Restriction', errs, output_api)
+  CheckMatchingEnum(ax_enums, 'DefaultActionVerb', automation_enums,
+                   'DefaultActionVerb', errs, output_api)
   return errs
 
 # Given a full path to c++ header, return an array of the first static