Index: ui/accessibility/platform/ax_platform_node_mac.mm |
diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm |
index 1f65af6547909edea6803351c6b6acea8cfa1cf3..78883fe7018913e0ae7e969ca17b1ede6bdad49c 100644 |
--- a/ui/accessibility/platform/ax_platform_node_mac.mm |
+++ b/ui/accessibility/platform/ax_platform_node_mac.mm |
@@ -105,6 +105,7 @@ RoleMap BuildRoleMap() { |
{ui::AX_ROLE_RULER, NSAccessibilityRulerRole}, |
{ui::AX_ROLE_SCROLL_BAR, NSAccessibilityScrollBarRole}, |
{ui::AX_ROLE_SEARCH, NSAccessibilityGroupRole}, |
+ {ui::AX_ROLE_SEARCH_BOX, NSAccessibilityTextFieldRole}, |
{ui::AX_ROLE_SLIDER, NSAccessibilitySliderRole}, |
{ui::AX_ROLE_SLIDER_THUMB, NSAccessibilityValueIndicatorRole}, |
{ui::AX_ROLE_SPIN_BUTTON, NSAccessibilityIncrementorRole}, |
@@ -112,6 +113,7 @@ RoleMap BuildRoleMap() { |
{ui::AX_ROLE_STATIC_TEXT, NSAccessibilityStaticTextRole}, |
{ui::AX_ROLE_STATUS, NSAccessibilityGroupRole}, |
{ui::AX_ROLE_SVG_ROOT, NSAccessibilityGroupRole}, |
+ {ui::AX_ROLE_SWITCH, NSAccessibilityCheckBoxRole}, |
{ui::AX_ROLE_TAB, NSAccessibilityRadioButtonRole}, |
{ui::AX_ROLE_TABLE, NSAccessibilityTableRole}, |
{ui::AX_ROLE_TABLE_HEADER_CONTAINER, NSAccessibilityGroupRole}, |
@@ -145,27 +147,29 @@ RoleMap BuildSubroleMap() { |
const MapEntry subroles[] = { |
{ui::AX_ROLE_ALERT, @"AXApplicationAlert"}, |
{ui::AX_ROLE_ALERT_DIALOG, @"AXApplicationAlertDialog"}, |
+ {ui::AX_ROLE_APPLICATION, @"AXLandmarkApplication"}, |
{ui::AX_ROLE_ARTICLE, @"AXDocumentArticle"}, |
+ {ui::AX_ROLE_BANNER, @"AXLandmarkBanner"}, |
+ {ui::AX_ROLE_COMPLEMENTARY, @"AXLandmarkComplementary"}, |
+ {ui::AX_ROLE_CONTENT_INFO, @"AXLandmarkContentInfo"}, |
{ui::AX_ROLE_DEFINITION, @"AXDefinition"}, |
{ui::AX_ROLE_DESCRIPTION_LIST_DETAIL, @"AXDefinition"}, |
{ui::AX_ROLE_DESCRIPTION_LIST_TERM, @"AXTerm"}, |
{ui::AX_ROLE_DIALOG, @"AXApplicationDialog"}, |
{ui::AX_ROLE_DOCUMENT, @"AXDocument"}, |
{ui::AX_ROLE_FOOTER, @"AXLandmarkContentInfo"}, |
- {ui::AX_ROLE_APPLICATION, @"AXLandmarkApplication"}, |
- {ui::AX_ROLE_BANNER, @"AXLandmarkBanner"}, |
- {ui::AX_ROLE_COMPLEMENTARY, @"AXLandmarkComplementary"}, |
- {ui::AX_ROLE_CONTENT_INFO, @"AXLandmarkContentInfo"}, |
- {ui::AX_ROLE_MAIN, @"AXLandmarkMain"}, |
- {ui::AX_ROLE_NAVIGATION, @"AXLandmarkNavigation"}, |
- {ui::AX_ROLE_SEARCH, @"AXLandmarkSearch"}, |
{ui::AX_ROLE_FORM, @"AXLandmarkForm"}, |
{ui::AX_ROLE_LOG, @"AXApplicationLog"}, |
+ {ui::AX_ROLE_MAIN, @"AXLandmarkMain"}, |
{ui::AX_ROLE_MARQUEE, @"AXApplicationMarquee"}, |
{ui::AX_ROLE_MATH, @"AXDocumentMath"}, |
+ {ui::AX_ROLE_NAVIGATION, @"AXLandmarkNavigation"}, |
{ui::AX_ROLE_NOTE, @"AXDocumentNote"}, |
{ui::AX_ROLE_REGION, @"AXDocumentRegion"}, |
+ {ui::AX_ROLE_SEARCH, @"AXLandmarkSearch"}, |
+ {ui::AX_ROLE_SEARCH_BOX, @"AXSearchField"}, |
{ui::AX_ROLE_STATUS, @"AXApplicationStatus"}, |
+ {ui::AX_ROLE_SWITCH, @"AXSwitch"}, |
{ui::AX_ROLE_TAB_PANEL, @"AXTabPanel"}, |
{ui::AX_ROLE_TIMER, @"AXApplicationTimer"}, |
{ui::AX_ROLE_TOGGLE_BUTTON, @"AXToggleButton"}, |