[Switch Access] Enter group from group nodes

This CL takes another step towards encapsulating action behavior in the
node classes.

Bug: None
Change-Id: If709c22606016930ce715168d50a7a2f7176788c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2076443
Commit-Queue: Anastasia Helfinstein <anastasi@google.com>
Reviewed-by: David Tseng <dtseng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746532}

chrome/browser/resources/chromeos/accessibility/switch_access/menu_manager.js

@@ -508,14 +508,6 @@ class MenuManager {
    */
   performAction(action) {
     SwitchAccessMetrics.recordMenuAction(action);
-    // Some actions involve navigation events. Handle those explicitly.
-    if (action === SAConstants.MenuAction.SELECT &&
-        this.menuOriginNode_.isGroup()) {
-      NavigationManager.enterGroup();
-      this.exit_();
-      return;
-    }
-
     // Handle global actions.
     if (action === SAConstants.MenuAction.SETTINGS) {
       chrome.accessibilityPrivate.openSettingsSubpage(

chrome/browser/resources/chromeos/accessibility/switch_access/nodes/group_node.js

@@ -111,6 +111,10 @@ class GroupNode extends SAChildNode {
 
   /** @override */
   performAction(action) {
+    if (action === SAConstants.MenuAction.SELECT) {
+      NavigationManager.enterGroup();
+      return SAConstants.ActionResponse.CLOSE_MENU;
+    }
     return SAConstants.ActionResponse.NO_ACTION_TAKEN;
   }
 

chrome/browser/resources/chromeos/accessibility/switch_access/nodes/node_wrapper.js

@@ -140,7 +140,11 @@ class NodeWrapper extends SAChildNode {
     let ancestor;
     switch (action) {
       case SAConstants.MenuAction.SELECT:
-        this.baseNode_.doDefault();
+        if (this.isGroup()) {
+          NavigationManager.enterGroup();
+        } else {
+          this.baseNode_.doDefault();
+        }
         return SAConstants.ActionResponse.CLOSE_MENU;
       case SAConstants.MenuAction.SCROLL_DOWN:
         ancestor = this.getScrollableAncestor_();