MacViews/a11y: Accessibility actions use AXActionData in AXPlatformNodeDelegate.

ui/views/accessibility/native_view_accessibility.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.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "build/build_config.h"
-#include "ui/accessibility/ax_action_data.h"
-#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 #if !defined(PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL)
 // static
@@ skipping 22 matching lines @@
 
 void NativeViewAccessibility::Destroy() {
   delete this;
 }
 
 void NativeViewAccessibility::NotifyAccessibilityEvent(ui::AXEvent event_type) {
   if (ax_node_)
     ax_node_->NotifyAccessibilityEvent(event_type);
 }
 
+bool NativeViewAccessibility::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& NativeViewAccessibility::GetData() {
   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 114 matching lines @@
   View* focused_view =
       focus_manager ? focus_manager->GetFocusedView() : nullptr;
   return focused_view ? focused_view->GetNativeViewAccessible() : nullptr;
 }
 
 gfx::AcceleratedWidget
 NativeViewAccessibility::GetTargetForNativeAccessibilityEvent() {
   return gfx::kNullAcceleratedWidget;
 }
 
+bool NativeViewAccessibility::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_SET_FOCUS:
+      return SetFocused(true);
+    case ui::AX_ACTION_BLUR:
+      return SetFocused(false);
+
+    // Actions that only apply to specific Views should be dealt with by
+    // HandleAccessibleAction().
+    case ui::AX_ACTION_REPLACE_SELECTED_TEXT:
+    case ui::AX_ACTION_SET_VALUE:
+      return view_->HandleAccessibleAction(data);
+      break;
+
+    // Not yet implemented accessibility actions.
+    case ui::AX_ACTION_DECREMENT:
+    case ui::AX_ACTION_HIT_TEST:
+    case ui::AX_ACTION_INCREMENT:
+    case ui::AX_ACTION_SCROLL_TO_MAKE_VISIBLE:
+    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_SELECTION:
+    case ui::AX_ACTION_SHOW_CONTEXT_MENU:
+      NOTIMPLEMENTED();

[dmazzoni, 2016/11/21 04:53:38]

It might be better to just call view_->HandleAccessibleAction
for everything else, that has its own switch.

That way if a View ever wants to implement one of these, it
won't have to modify this file again.

[Patti Lor, 2016/11/21 23:24:39]

Done.

+      break;
+
+    // Actions that are only used for the web or not used for Views.
+    case ui::AX_ACTION_SET_SEQUENTIAL_FOCUS_NAVIGATION_STARTING_POINT:
+    case ui::AX_ACTION_NONE:

[dmazzoni, 2016/11/21 04:53:38]

nit: the comment above implies AX_ACTION_NONE is used on the web, but it's
not an action at all, it shouldn't ever be reached

[Patti Lor, 2016/11/21 23:24:39]

Deleted!

+      NOTREACHED();
+      break;
+  }
+  return false;
+}
+
 void NativeViewAccessibility::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));
 }
 
-bool NativeViewAccessibility::SetStringValue(const base::string16& new_value,
-                                             bool clear_first) {
-  // Return an error if the view can't set the value.
-  if (!CanSetStringValue())
-    return false;
-
-  ui::AXActionData action_data;
-  action_data.value = new_value;
-  action_data.action = clear_first ? ui::AX_ACTION_SET_VALUE
-      : ui::AX_ACTION_REPLACE_SELECTED_TEXT;
-  return view_->HandleAccessibleAction(action_data);
-}
-
-bool NativeViewAccessibility::CanSetStringValue() {
-  return !ui::AXNodeData::IsFlagSet(GetData().state, ui::AX_STATE_READ_ONLY);
-}
-
-bool NativeViewAccessibility::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;
-}
-
 void NativeViewAccessibility::OnWidgetDestroying(Widget* widget) {
   if (parent_widget_ == widget) {
     parent_widget_->RemoveObserver(this);
     parent_widget_ = nullptr;
   }
 }
 
 void NativeViewAccessibility::SetParentWidget(Widget* parent_widget) {
   if (parent_widget_)
     parent_widget_->RemoveObserver(this);
@@ skipping 30 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