A11y: Rename AXSupportedAction to AXDefaultActionVerb.

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 420 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->HasIntAttribute(ui::AX_ATTR_ACTION))
+  if (!target->HasIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB))
     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 2253 matching lines @@
   AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
   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() || HasIntAttribute(ui::AX_ATTR_ACTION)) {
+  if (IsHyperlink() || HasIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB)) {
     *n_actions = 1;
   } else {
     *n_actions = 0;
   }
 
   return S_OK;
 }
 
 STDMETHODIMP BrowserAccessibilityWin::doAction(long action_index) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_DO_ACTION);
   AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
   if (!instance_active())
     return E_FAIL;
 
-  if (!HasIntAttribute(ui::AX_ATTR_ACTION) || action_index != 0)
+  if (!HasIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB) || 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);
   AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
@@ skipping 12 matching lines @@
 STDMETHODIMP BrowserAccessibilityWin::get_name(long action_index, BSTR* name) {
   WIN_ACCESSIBILITY_API_HISTOGRAM(UMA_API_GET_NAME);
   AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
   if (!instance_active())
     return E_FAIL;
 
   if (!name)
     return E_INVALIDARG;
 
   int action;
-  if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) {
+  if (!GetIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB, &action) ||
+      action_index != 0) {
     *name = nullptr;
     return E_INVALIDARG;
   }
 
-  base::string16 action_verb =
-      ui::ActionToUnlocalizedString(static_cast<ui::AXSupportedAction>(action));
+  base::string16 action_verb = ui::ActionToUnlocalizedString(
+      static_cast<ui::AXDefaultActionVerb>(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);
   AddAccessibilityModeFlags(kScreenReaderAndHTMLAccessibilityModes);
   if (!instance_active())
     return E_FAIL;
 
   if (!localized_name)
     return E_INVALIDARG;
 
   int action;
-  if (!GetIntAttribute(ui::AX_ATTR_ACTION, &action) || action_index != 0) {
+  if (!GetIntAttribute(ui::AX_ATTR_DEFAULT_ACTION_VERB, &action) ||
+      action_index != 0) {
     *localized_name = nullptr;
     return E_INVALIDARG;
   }
 
   base::string16 action_verb =
-      ui::ActionToString(static_cast<ui::AXSupportedAction>(action));
+      ui::ActionToString(static_cast<ui::AXDefaultActionVerb>(action));

[dmazzoni, 2017/05/12 03:08:58]

And this one should be ActionVerbToLocalizedString...

[Patti Lor, 2017/05/15 06:03:42]

Done.

   if (action_verb.empty()) {
     *localized_name = nullptr;
     return S_FALSE;
   }
 
   *localized_name = SysAllocString(action_verb.c_str());
   DCHECK(localized_name);
   return S_OK;
 }
 
@@ skipping 2836 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