Create AXAction and AXActionData as a way to simplify accessibility actions

chrome/browser/ui/aura/accessibility/automation_manager_aura.cc

 // 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.
 
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
 
 #include <stddef.h>
 
 #include <vector>
 
 #include "base/memory/singleton.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_event_router.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/browser_context.h"
+#include "ui/accessibility/ax_action_data.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/aura/window.h"
 #include "ui/views/accessibility/ax_aura_obj_wrapper.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/wm/window_util.h"  // nogncheck
 #endif
 
 using content::BrowserContext;
@@ skipping 45 matching lines @@
                                         const std::string& text) {
   if (!enabled_)
     return;
 
   views::AXAuraObjWrapper* obj =
       static_cast<AXRootObjWrapper*>(current_tree_->GetRoot())
           ->GetAlertForText(text);
   SendEvent(context, obj, ui::AX_EVENT_ALERT);
 }
 
-void AutomationManagerAura::DoDefault(int32_t id) {
+void AutomationManagerAura::PerformAction(
+    ui::AXAction action,
+    const ui::AXActionData& data) {
   CHECK(enabled_);
-  current_tree_->DoDefault(id);
-}
 
-void AutomationManagerAura::Focus(int32_t id) {
-  CHECK(enabled_);
-  current_tree_->Focus(id);
-}
-
-void AutomationManagerAura::MakeVisible(int32_t id) {
-  CHECK(enabled_);
-  current_tree_->MakeVisible(id);
-}
-
-void AutomationManagerAura::SetSelection(int32_t anchor_id,
-                                         int32_t anchor_offset,
-                                         int32_t focus_id,
-                                         int32_t focus_offset) {
-  CHECK(enabled_);
-  if (anchor_id != focus_id) {
-    NOTREACHED();
-    return;
+  switch (action) {
+    case ui::AX_ACTION_DO_DEFAULT:
+      current_tree_->DoDefault(data.target_node_id);
+      break;
+    case ui::AX_ACTION_SET_FOCUS:
+      current_tree_->Focus(data.target_node_id);
+      break;
+    case ui::AX_ACTION_SCROLL_TO_MAKE_VISIBLE:
+      current_tree_->MakeVisible(data.target_node_id);
+      break;
+    case ui::AX_ACTION_SET_SELECTION:
+      if (data.anchor_node_id != data.focus_node_id) {
+        NOTREACHED();
+        return;
+      }
+      current_tree_->SetSelection(
+          data.anchor_node_id, data.anchor_offset, data.focus_offset);
+      break;
+    case ui::AX_ACTION_SHOW_CONTEXT_MENU:
+      current_tree_->ShowContextMenu(data.target_node_id);
+      break;
+    case ui::AX_ACTION_HIT_TEST:
+    case ui::AX_ACTION_SCROLL_TO_POINT:
+    case ui::AX_ACTION_SET_ACCESSIBILITY_FOCUS:
+    case ui::AX_ACTION_SET_SCROLL_OFFSET:
+    case ui::AX_ACTION_SET_VALUE:
+      // Not implemented yet.

[David Tseng, 2016/10/13 22:15:14]

NOTREACHED

[dmazzoni, 2016/10/14 20:49:39]

Done

+      break;
+    case ui::AX_ACTION_NONE:
+      NOTREACHED();
+      break;

[David Tseng, 2016/10/13 22:15:14]

default, to get a compile time warning?

[dmazzoni, 2016/10/14 20:49:39]

I deliberately left out default so that if we
add a new enum we'll be forced to think about it
here

   }
-  current_tree_->SetSelection(anchor_id, anchor_offset, focus_offset);
-}
-
-void AutomationManagerAura::ShowContextMenu(int32_t id) {
-  CHECK(enabled_);
-  current_tree_->ShowContextMenu(id);
 }
 
 void AutomationManagerAura::OnChildWindowRemoved(
     views::AXAuraObjWrapper* parent) {
   if (!enabled_)
     return;
 
   if (!parent)
     parent = current_tree_->GetRoot();
 
@@ skipping 49 matching lines @@
 
   processing_events_ = false;
   auto pending_events_copy = pending_events_;
   pending_events_.clear();
   for (size_t i = 0; i < pending_events_copy.size(); ++i) {
     SendEvent(context,
               pending_events_copy[i].first,
               pending_events_copy[i].second);
   }
 }