Move implementation of accessibility actions to views::View

ui/views/accessibility/native_view_accessibility_base.cc

 // Copyright (c) 2013 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 "ui/views/accessibility/native_view_accessibility_base.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/native_widget_types.h"
@@ skipping 18 matching lines @@
 
 gfx::NativeViewAccessible NativeViewAccessibilityBase::GetNativeObject() {
   return ax_node_->GetNativeViewAccessible();
 }
 
 void NativeViewAccessibilityBase::NotifyAccessibilityEvent(
     ui::AXEvent event_type) {
   ax_node_->NotifyAccessibilityEvent(event_type);
 }
 
-bool NativeViewAccessibilityBase::SetFocused(bool focused) {
-  if (!ui::AXNodeData::IsFlagSet(GetData().state, ui::AX_STATE_FOCUSABLE))
-    return false;
-
-  if (focused)
-    view_->RequestFocus();
-  else if (view_->HasFocus())
-    view_->GetFocusManager()->ClearFocus();
-  return true;
-}
-
 // ui::AXPlatformNodeDelegate
 
 const ui::AXNodeData& NativeViewAccessibilityBase::GetData() const {
   data_ = ui::AXNodeData();
   data_.state = 0;
 
   // Views may misbehave if their widget is closed; return an unknown role
   // rather than possibly crashing.
   if (!view_->GetWidget() || view_->GetWidget()->IsClosed()) {
     data_.role = ui::AX_ROLE_UNKNOWN;
@@ skipping 112 matching lines @@
   return focused_view ? focused_view->GetNativeViewAccessible() : nullptr;
 }
 
 gfx::AcceleratedWidget
 NativeViewAccessibilityBase::GetTargetForNativeAccessibilityEvent() {
   return gfx::kNullAcceleratedWidget;
 }
 
 bool NativeViewAccessibilityBase::AccessibilityPerformAction(
     const ui::AXActionData& data) {
-  switch (data.action) {
-    // Handle accessible actions that apply to all Views here.
-    case ui::AX_ACTION_DO_DEFAULT:
-      DoDefaultAction();
-      return true;
-    case ui::AX_ACTION_FOCUS:
-      return SetFocused(true);
-    case ui::AX_ACTION_BLUR:
-      return SetFocused(false);
-
-    case ui::AX_ACTION_NONE:
-      NOTREACHED();
-      break;
-
-    // All other actions can potentially be dealt with by the View itself.
-    default:
-      return view_->HandleAccessibleAction(data);
-      break;
-  }
-  return false;
-}
-
-void NativeViewAccessibilityBase::DoDefaultAction() {
-  gfx::Point center = view_->GetLocalBounds().CenterPoint();
-  view_->OnMousePressed(ui::MouseEvent(
-      ui::ET_MOUSE_PRESSED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
-  view_->OnMouseReleased(ui::MouseEvent(
-      ui::ET_MOUSE_RELEASED, center, center, ui::EventTimeForNow(),
-      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  return view_->HandleAccessibleAction(data);
 }
 
 void NativeViewAccessibilityBase::OnWidgetDestroying(Widget* widget) {
   if (parent_widget_ == widget) {
     parent_widget_->RemoveObserver(this);
     parent_widget_ = nullptr;
   }
 }
 
 void NativeViewAccessibilityBase::SetParentWidget(Widget* parent_widget) {
@@ skipping 34 matching lines @@
               child_widget_platform_node->GetDelegate());
       if (child_widget_view_accessibility->parent_widget() != widget)
         child_widget_view_accessibility->SetParentWidget(widget);
     }
 
     result_child_widgets->push_back(child_widget);
   }
 }
 
 }  // namespace views