Moved action verbs out of Blink.

content/browser/accessibility/browser_accessibility_win.cc

 // Copyright (c) 2012 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 "content/browser/accessibility/browser_accessibility_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 403 matching lines @@
 HRESULT BrowserAccessibilityWin::accDoDefaultAction(VARIANT var_id) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_DO_DEFAULT_ACTION);
   if (!instance_active())
     return E_FAIL;
 
   BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
   // Return an error if it's not clickable.
-  if (!target->HasStringAttribute(ui::AX_ATTR_ACTION))
+  if (!target->HasIntAttribute(ui::AX_ATTR_ACTION))
     return DISP_E_MEMBERNOTFOUND;
 
   manager()->DoDefaultAction(*target);
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::accHitTest(LONG x_left,
                                                  LONG y_top,
                                                  VARIANT* child) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_ACC_HIT_TEST);
@@ skipping 135 matching lines @@
   if (!instance_active())
     return E_FAIL;
 
   if (!def_action)
     return E_INVALIDARG;
 
   BrowserAccessibilityWin* target = GetTargetFromChildID(var_id);
   if (!target)
     return E_INVALIDARG;
 
-  return target->GetStringAttributeAsBstr(
-      ui::AX_ATTR_ACTION, def_action);
+  return target->get_localizedName(0, def_action);
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_accDescription(VARIANT var_id,
                                                          BSTR* desc) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_ACC_DESCRIPTION);
   if (!instance_active())
     return E_FAIL;
 
   if (!desc)
     return E_INVALIDARG;
@@ skipping 2240 matching lines @@
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_N_ACTIONS);
   if (!instance_active())
     return E_FAIL;
 
   if (!n_actions)
     return E_INVALIDARG;
 
   // |IsHyperlink| is required for |IAccessibleHyperlink::anchor/anchorTarget|
   // to work properly because the |IAccessibleHyperlink| interface inherits from
   // |IAccessibleAction|.
-  if (IsHyperlink() || HasStringAttribute(ui::AX_ATTR_ACTION)) {
+  if (IsHyperlink() || HasIntAttribute(ui::AX_ATTR_ACTION)) {
     *n_actions = 1;
   } else {
     *n_actions = 0;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::doAction(long action_index) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_DO_ACTION);
   if (!instance_active())
     return E_FAIL;
 
-  if (!HasStringAttribute(ui::AX_ATTR_ACTION) || action_index != 0)
+  if (!HasIntAttribute(ui::AX_ATTR_ACTION) || action_index != 0)
     return E_INVALIDARG;
 
   manager()->DoDefaultAction(*this);
   return S_OK;
 }
 
 STDMETHODIMP
 BrowserAccessibilityWin::get_description(long action_index, BSTR* description) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_IAACTION_GET_DESCRIPTION);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_keyBinding(long action_index,
                                                      long n_max_bindings,
                                                      BSTR** key_bindings,
                                                      long* n_bindings) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_KEY_BINDING);
   return E_NOTIMPL;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::get_name(long action_index, BSTR* name) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NAME);
   if (!instance_active())
     return E_FAIL;
 
   if (!name)
     return E_INVALIDARG;
 
-  base::string16 action_verb;
-  if (!GetString16Attribute(ui::AX_ATTR_ACTION, &action_verb) ||
-      action_index != 0) {
+  int action;
+  if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) {
     *name = nullptr;
     return E_INVALIDARG;
   }
 
+  base::string16 action_verb =
+      ActionToUnlocalizedString(static_cast<ui::AXSupportedAction>(action));
+  if (action_verb.empty() || action_verb == L"none") {
+    *name = nullptr;
+    return S_FALSE;
+  }
+
   *name = SysAllocString(action_verb.c_str());
   DCHECK(name);
   return S_OK;
 }
 
 STDMETHODIMP
 BrowserAccessibilityWin::get_localizedName(long action_index,
                                            BSTR* localized_name) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_LOCALIZED_NAME);
-  return E_NOTIMPL;
+  if (!instance_active())
+    return E_FAIL;
+
+  if (!localized_name)
+    return E_INVALIDARG;
+
+  int action;
+  if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) {
+    *localized_name = nullptr;
+    return E_INVALIDARG;
+  }
+
+  base::string16 action_verb =
+      ui::ActionToString(static_cast<ui::AXSupportedAction>(action));
+  if (action_verb.empty()) {
+    *localized_name = nullptr;
+    return S_FALSE;
+  }
+
+  *localized_name = SysAllocString(action_verb.c_str());
+  DCHECK(localized_name);
+  return S_OK;
 }
 
 //
 // IAccessibleValue methods.
 //
 
 STDMETHODIMP BrowserAccessibilityWin::get_currentValue(VARIANT* value) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_CURRENT_VALUE);
   if (!instance_active())
     return E_FAIL;
@@ skipping 1107 matching lines @@
 }
 
 bool BrowserAccessibilityWin::IsNative() const {
   return true;
 }
 
 void BrowserAccessibilityWin::OnLocationChanged() {
   FireNativeEvent(EVENT_OBJECT_LOCATIONCHANGE);
 }
 
+// Some APIs need to return non-localized action names.
+// static
+base::string16 BrowserAccessibilityWin::ActionToUnlocalizedString(
+    ui::AXSupportedAction supported_action) {
+  switch (supported_action) {
+    case ui::AX_SUPPORTED_ACTION_NONE:

[dmazzoni, 2016/11/29 16:28:10]

This isn't a valid value, right? I think this should be NOTREACHED.

+      return L"none";
+    case ui::AX_SUPPORTED_ACTION_ACTIVATE:
+      return L"activate";
+    case ui::AX_SUPPORTED_ACTION_CHECK:
+      return L"check";
+    case ui::AX_SUPPORTED_ACTION_CLICK:
+      return L"click";
+    case ui::AX_SUPPORTED_ACTION_JUMP:
+      return L"jump";
+    case ui::AX_SUPPORTED_ACTION_OPEN:
+      return L"open";
+    case ui::AX_SUPPORTED_ACTION_PRESS:
+      return L"press";
+    case ui::AX_SUPPORTED_ACTION_SELECT:
+      return L"select";
+    case ui::AX_SUPPORTED_ACTION_UNCHECK:
+      return L"uncheck";
+  }
+  NOTREACHED();
+  return base::string16();
+}
+
 std::vector<base::string16> BrowserAccessibilityWin::ComputeTextAttributes()
     const {
   std::vector<base::string16> attributes;
 
   // We include list markers for now, but there might be other objects that are
   // auto generated.
   // TODO(nektar): Compute what objects are auto-generated in Blink.
   if (GetRole() == ui::AX_ROLE_LIST_MARKER)
     attributes.push_back(L"auto-generated:true");
   else
@@ skipping 1492 matching lines @@
   return static_cast<BrowserAccessibilityWin*>(obj);
 }
 
 const BrowserAccessibilityWin*
 ToBrowserAccessibilityWin(const BrowserAccessibility* obj) {
   DCHECK(!obj || obj->IsNative());
   return static_cast<const BrowserAccessibilityWin*>(obj);
 }
 
 }  // namespace content