Add custom action support

components/arc/common/accessibility_helper.mojom

 // Copyright 2017 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.
 
-// Next MinVersion: 3
+// Next MinVersion: 4
 
 module arc.mojom;
 
 import "screen_rect.mojom";
 
 // For future maintainers, each of the below enums were hand picked
 // from their equivalents in the Android source. Keep them in the
 // order given below and add as needed. The initial order matches the
 // order they appear in source files.
 
@@ skipping 46 matching lines @@
   PREVIOUS_HTML_ELEMENT,  // unused
   SCROLL_FORWARD,
   SCROLL_BACKWARD,
   COPY,
   PASTE,
   CUT,
   SET_SELECTION,
   EXPAND,
   COLLAPSE,
   DISMISS,
-  SET_TEXT
+  SET_TEXT,
+  CONTEXT_CLICK,
+  SCROLL_DOWN,
+  SCROLL_LEFT,
+  SCROLL_RIGHT,
+  SCROLL_TO_POSITION,
+  SCROLL_UP,
+  SET_PROGRESS,
+  SHOW_ON_SCREEN,
+  CUSTOM_ACTION  // Not a standard action.
 };
 
 // Possible boolean properties set on an AccessibilityNodeInfo.
 // https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html
 // The enum values appear in the same order as they do within
 // AccessibilityNodeInfo.java.
 [Extensible]
 enum AccessibilityBooleanProperty {
   CHECKABLE,
   CHECKED,
@@ skipping 40 matching lines @@
   TEXT_SELECTION_END,
   INPUT_TYPE,
   LIVE_REGION
 };
 
 // These fields are taken from List<int> instance members of
 // AccessibilityNodeInfo.
 [Extensible]
 enum AccessibilityIntListProperty {
   CHILD_NODE_IDS,
-  ACTIONS
+  CUSTOM_ACTION_IDS
+};
+
+[Extensible]
+enum AccessibilityStringListProperty {
+  CUSTOM_ACTION_DESCRIPTIONS
 };
 
 // AccessibilityNodeInfoData is a struct to contain info of
 // AccessibilityNodeInfo in Android.
 // https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.html
 struct AccessibilityNodeInfoData {
   ScreenRect bounds_in_screen;
   [MinVersion=1]int32 id;
   [MinVersion=1]map<AccessibilityBooleanProperty, bool>? boolean_properties;
   [MinVersion=1]map<AccessibilityStringProperty, string>? string_properties;
   [MinVersion=1]map<AccessibilityIntProperty, int32>? int_properties;
   [MinVersion=1]
       map<AccessibilityIntListProperty, array<int32>>? int_list_properties;
+  [MinVersion=3]map<AccessibilityStringListProperty, array<string>>? string_list_properties;

[Luis Héctor Chávez, 2017/06/13 15:00:22]

nit: 80col

[yawano, 2017/06/14 01:13:07]

Done.

 };
 
 // Filters the event type (and implicitly the data) sent by the ARC
 // accessibility service.
 [Extensible]
 enum AccessibilityFilterType {
   // No events will be sent.
   OFF,
 
   // Only send focus events along with the source focus node.
   FOCUS,
 
   // Send a complete tree from the event source's root for every event.
   ALL,
 
   // Send complete subtrees for root nodes with whitelisted package names.
   [MinVersion=2]WHITELISTED_PACKAGE_NAME
 };
 
 // AccessibilityEventData is a struct to contain info of
 // AccessibilityEvent in Android.
 // https://developer.android.com/reference/android/view/accessibility/AccessibilityEvent.html
 struct AccessibilityEventData {
   AccessibilityEventType event_type;
   int32 source_id;
   array<AccessibilityNodeInfoData> node_data;
 };
 
+// AccessibilityActionData is a struct to contain info of AccessibilityAction in
+// Android.
+// https://developer.android.com/reference/android/view/accessibility/AccessibilityNodeInfo.AccessibilityAction.html
+struct AccessibilityActionData {
+  AccessibilityActionType action_type;
+
+  // custom_action_id must be set if action_type is CUSTOM_ACTION.
+  int32 custom_action_id;
+};
+
 // Next method ID: 2
 interface AccessibilityHelperHost {
   OnAccessibilityEventDeprecated@0(AccessibilityEventType event_type,
                                    AccessibilityNodeInfoData? event_source);
 
   // OnAccessibilityEvent is called when a converted Android accessibility event
   // is sent from Android.
   OnAccessibilityEvent@1(AccessibilityEventData event_data);
 };
 
-// Next method ID: 3
+// Next method ID: 4
 interface AccessibilityHelperInstance {
   Init@0(AccessibilityHelperHost host);
 
-  // Perform the specified action on a node requested by a Chrome client.
-  PerformAction@1(int32 id, AccessibilityActionType action);
+  PerformActionDeprecated@1(int32 id, AccessibilityActionType action);
 
   // Set a filter on the event types received.
   SetFilter@2(AccessibilityFilterType filter_type);
+
+  // Perform an action on a node requested by a Chrome client.
+  [MinVersion=3]PerformAction@3(int32 node_id, AccessibilityActionData action_data);

[Luis Héctor Chávez, 2017/06/13 15:00:22]

nit: 80col

[David Tseng, 2017/06/13 17:02:05]

nit: Could just make node_id part of the AccessibilityActionData

[yawano, 2017/06/14 01:13:07]

Done.

 };