Move implementation of accessibility actions to views::View

chrome/browser/ui/aura/accessibility/ax_tree_source_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/ax_tree_source_aura.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 13 matching lines @@
 using views::AXAuraObjWrapper;
 
 AXTreeSourceAura::AXTreeSourceAura() {
   root_.reset(new AXRootObjWrapper(AXAuraObjCache::GetInstance()->GetNextID()));
 }
 
 AXTreeSourceAura::~AXTreeSourceAura() {
   root_.reset();
 }
 
-void AXTreeSourceAura::DoDefault(int32_t id) {
+bool AXTreeSourceAura::HandleAccessibleAction(const ui::AXActionData& action) {
+  int id = action.target_node_id;
+
+  // In Views, we only support setting the selection within a single node,
+  // not across multiple nodes like on the web.
+  if (action.action == ui::AX_ACTION_SET_SELECTION) {
+    if (action.anchor_node_id != action.focus_node_id) {
+      NOTREACHED();
+      return false;
+    }
+    id = action.anchor_node_id;
+  }
+
   AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
   if (obj)
-    obj->DoDefault();
-}
+    return obj->HandleAccessibleAction(action);
 
-void AXTreeSourceAura::Focus(int32_t id) {
-  AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
-  if (obj)
-    obj->Focus();
-}
-
-void AXTreeSourceAura::MakeVisible(int32_t id) {
-  AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
-  if (obj)
-    obj->MakeVisible();
-}
-
-void AXTreeSourceAura::SetSelection(int32_t id, int32_t start, int32_t end) {
-  AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
-  if (obj)
-    obj->SetSelection(start, end);
-}
-
-void AXTreeSourceAura::ShowContextMenu(int32_t id) {
-  AXAuraObjWrapper* obj = AXAuraObjCache::GetInstance()->Get(id);
-  if (obj)
-    obj->ShowContextMenu();
-}
-
-bool AXTreeSourceAura::HandleAccessibleAction(const ui::AXActionData& action) {
-  AXAuraObjWrapper* obj =
-      AXAuraObjCache::GetInstance()->Get(action.target_node_id);
-  if (obj)
-    return obj->HandleAccessibleAction(action);
   return false;
 }
 
 bool AXTreeSourceAura::GetTreeData(ui::AXTreeData* tree_data) const {
   tree_data->tree_id = 0;
   tree_data->loaded = true;
   tree_data->loading_progress = 1.0;
   AXAuraObjWrapper* focus = AXAuraObjCache::GetInstance()->GetFocus();
   if (focus)
     tree_data->focus_id = focus->GetID();
@@ skipping 67 matching lines @@
 
   std::vector<AXAuraObjWrapper*> children;
   root->GetChildren(&children);
 
   prefix += prefix[0];
   for (size_t i = 0; i < children.size(); ++i)
     output += ToString(children[i], prefix);
 
   return output;
 }