MacViews: Implement NSAccessibilityPressAction for Views with clickable roles.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.

[Patti Lor, 2017/02/09 23:11:23]

All the changes in this file were required to make the compiler happy after
changing GetRole() to return a ui::AXRole. Is adding the default case to the
ones that only handle a few roles OK, or if we should be explicitly listing all
roles?

[dmazzoni, 2017/02/09 23:21:09]

Default case is fine for small switches. Thanks.

[tapted, 2017/02/09 23:25:05]

what you've done here lg imo, but I don't know much about android a11y

[Patti Lor, 2017/02/10 00:05:58]

Thanks both :)

 // 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_android.h"
 
 #include "base/i18n/break_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 413 matching lines @@
   base::string16 value = GetValue();
   if (!value.empty()) {
     if (HasState(ui::AX_STATE_EDITABLE))
       return value;
 
     switch (GetRole()) {
       case ui::AX_ROLE_COMBO_BOX:
       case ui::AX_ROLE_POP_UP_BUTTON:
       case ui::AX_ROLE_TEXT_FIELD:
         return value;
+      default:
+        break;
     }
   }
 
   // For color wells, the color is stored in separate attributes.
   // Perhaps we could return color names in the future?
   if (GetRole() == ui::AX_ROLE_COLOR_WELL) {
     unsigned int color =
         static_cast<unsigned int>(GetIntAttribute(ui::AX_ATTR_COLOR_VALUE));
     unsigned int red = SkColorGetR(color);
     unsigned int green = SkColorGetG(color);
@@ skipping 82 matching lines @@
       break;
     case ui::AX_ROLE_ANNOTATION:
       // No role description.
       break;
     case ui::AX_ROLE_APPLICATION:
       message_id = IDS_AX_ROLE_APPLICATION;
       break;
     case ui::AX_ROLE_ARTICLE:
       message_id = IDS_AX_ROLE_ARTICLE;
       break;
+    case ui::AX_ROLE_AUDIO:
+      message_id = IDS_AX_MEDIA_AUDIO_ELEMENT;
+      break;
     case ui::AX_ROLE_BANNER:
       message_id = IDS_AX_ROLE_BANNER;
       break;
     case ui::AX_ROLE_BLOCKQUOTE:
       message_id = IDS_AX_ROLE_BLOCKQUOTE;
       break;
     case ui::AX_ROLE_BUSY_INDICATOR:
       message_id = IDS_AX_ROLE_BUSY_INDICATOR;
       break;
     case ui::AX_ROLE_BUTTON:
@@ skipping 70 matching lines @@
       break;
     case ui::AX_ROLE_DIV:
       // No role description.
       break;
     case ui::AX_ROLE_DOCUMENT:
       message_id = IDS_AX_ROLE_DOCUMENT;
       break;
     case ui::AX_ROLE_EMBEDDED_OBJECT:
       message_id = IDS_AX_ROLE_EMBEDDED_OBJECT;
       break;
+    case ui::AX_ROLE_FEED:
+      // No role description.

[dmazzoni, 2017/02/09 23:21:09]

We should add this one, it's a relatively new addition to ARIA.

Make this a TODO?

[Patti Lor, 2017/02/10 00:05:58]

Done, also followed this up in https://codereview.chromium.org/2690473002/.

+      break;
     case ui::AX_ROLE_FIGCAPTION:
       // No role description.
       break;
     case ui::AX_ROLE_FIGURE:
       message_id = IDS_AX_ROLE_GRAPHIC;
       break;
     case ui::AX_ROLE_FOOTER:
       message_id = IDS_AX_ROLE_FOOTER;
       break;
     case ui::AX_ROLE_FORM:
@@ skipping 72 matching lines @@
       break;
     case ui::AX_ROLE_MARK:
       message_id = IDS_AX_ROLE_MARK;
       break;
     case ui::AX_ROLE_MARQUEE:
       message_id = IDS_AX_ROLE_MARQUEE;
       break;
     case ui::AX_ROLE_MATH:
       message_id = IDS_AX_ROLE_MATH;
       break;
+    case ui::AX_ROLE_MENU:
+      message_id = IDS_AX_ROLE_MENU;
+      break;
     case ui::AX_ROLE_MENU_BAR:
       message_id = IDS_AX_ROLE_MENU_BAR;
       break;
     case ui::AX_ROLE_MENU_BUTTON:
       message_id = IDS_AX_ROLE_MENU_BUTTON;
       break;
     case ui::AX_ROLE_MENU_ITEM:
       message_id = IDS_AX_ROLE_MENU_ITEM;
       break;
     case ui::AX_ROLE_MENU_ITEM_CHECK_BOX:
       message_id = IDS_AX_ROLE_CHECK_BOX;
       break;
     case ui::AX_ROLE_MENU_ITEM_RADIO:
       message_id = IDS_AX_ROLE_RADIO;
       break;
     case ui::AX_ROLE_MENU_LIST_OPTION:
       // No role description.
       break;
     case ui::AX_ROLE_MENU_LIST_POPUP:
       // No role description.
       break;
-    case ui::AX_ROLE_MENU:
-      message_id = IDS_AX_ROLE_MENU;
-      break;
     case ui::AX_ROLE_METER:
       message_id = IDS_AX_ROLE_METER;
       break;
     case ui::AX_ROLE_NAVIGATION:
       message_id = IDS_AX_ROLE_NAVIGATIONAL_LINK;
       break;
     case ui::AX_ROLE_NOTE:
       message_id = IDS_AX_ROLE_NOTE;
       break;
     case ui::AX_ROLE_OUTLINE:
@@ skipping 94 matching lines @@
       break;
     case ui::AX_ROLE_TAB:
       message_id = IDS_AX_ROLE_TAB;
       break;
     case ui::AX_ROLE_TABLE_HEADER_CONTAINER:
       // No role description.
       break;
     case ui::AX_ROLE_TABLE:
       message_id = IDS_AX_ROLE_TABLE;
       break;
+    case ui::AX_ROLE_TERM:
+      message_id = IDS_AX_ROLE_DESCRIPTION_TERM;
+      break;
     case ui::AX_ROLE_TEXT_FIELD:
       // No role description.
       break;
     case ui::AX_ROLE_TIME:
       message_id = IDS_AX_ROLE_TIME;
       break;
     case ui::AX_ROLE_TIMER:
       message_id = IDS_AX_ROLE_TIMER;
       break;
     case ui::AX_ROLE_TITLE_BAR:
@@ skipping 13 matching lines @@
       break;
     case ui::AX_ROLE_TREE:
       message_id = IDS_AX_ROLE_TREE;
       break;
     case ui::AX_ROLE_UNKNOWN:
       // No role description.
       break;
     case ui::AX_ROLE_TOOLTIP:
       message_id = IDS_AX_ROLE_TOOLTIP;
       break;
+    case ui::AX_ROLE_VIDEO:
+      message_id = IDS_AX_MEDIA_VIDEO_ELEMENT;
+      break;
     case ui::AX_ROLE_WEB_AREA:
       // No role description.
       break;
     case ui::AX_ROLE_WEB_VIEW:
       // No role description.
       break;
     case ui::AX_ROLE_WINDOW:
       // No role description.
       break;
+    case ui::AX_ROLE_NONE:
+      // No role description.
+      break;
   }
 
   if (message_id != -1)
     return content_client->GetLocalizedString(message_id);
 
   return base::string16();
 }
 
 int BrowserAccessibilityAndroid::GetItemIndex() const {
   int index = 0;
   switch (GetRole()) {
     case ui::AX_ROLE_LIST_ITEM:
     case ui::AX_ROLE_LIST_BOX_OPTION:
     case ui::AX_ROLE_TREE_ITEM:
       index = GetIntAttribute(ui::AX_ATTR_POS_IN_SET) - 1;
       break;
     case ui::AX_ROLE_SLIDER:
     case ui::AX_ROLE_PROGRESS_INDICATOR: {
       // Return a percentage here for live feedback in an AccessibilityEvent.
       // The exact value is returned in RangeCurrentValue.
       float min = GetFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE);
       float max = GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE);
       float value = GetFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE);
       if (max > min && value >= min && value <= max)
         index = static_cast<int>(((value - min)) * 100 / (max - min));
       break;
     }
+    default:
+      break;
   }
   return index;
 }
 
 int BrowserAccessibilityAndroid::GetItemCount() const {
   int count = 0;
   switch (GetRole()) {
     case ui::AX_ROLE_LIST:
     case ui::AX_ROLE_LIST_BOX:
     case ui::AX_ROLE_DESCRIPTION_LIST:
       count = PlatformChildCount();
       break;
     case ui::AX_ROLE_SLIDER:
     case ui::AX_ROLE_PROGRESS_INDICATOR:
       // An AccessibilityEvent can only return integer information about a
       // seek control, so we return a percentage. The real range is returned
       // in RangeMin and RangeMax.
       count = 100;
       break;
+    default:
+      break;
   }
   return count;
 }
 
 bool BrowserAccessibilityAndroid::CanScrollForward() const {
   if (IsSlider()) {
     float value = GetFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE);
     float max = GetFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE);
     return value < max;
   } else {
@@ skipping 522 matching lines @@
 int BrowserAccessibilityAndroid::CountChildrenWithRole(ui::AXRole role) const {
   int count = 0;
   for (uint32_t i = 0; i < PlatformChildCount(); i++) {
     if (PlatformGetChild(i)->GetRole() == role)
       count++;
   }
   return count;
 }
 
 }  // namespace content