Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(764)

Side by Side Diff: ui/accessibility/platform/ax_platform_node_mac.mm

Issue 1030333002: Chromium side Implementation of new roles added in ARIA 1.1 draft. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updating failed expectations Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/accessibility/ax_enums.idl ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ui/accessibility/platform/ax_platform_node_mac.h" 5 #import "ui/accessibility/platform/ax_platform_node_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
10 #import "ui/accessibility/ax_node_data.h" 10 #import "ui/accessibility/ax_node_data.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 {ui::AX_ROLE_PROGRESS_INDICATOR, NSAccessibilityProgressIndicatorRole}, 98 {ui::AX_ROLE_PROGRESS_INDICATOR, NSAccessibilityProgressIndicatorRole},
99 {ui::AX_ROLE_RADIO_BUTTON, NSAccessibilityRadioButtonRole}, 99 {ui::AX_ROLE_RADIO_BUTTON, NSAccessibilityRadioButtonRole},
100 {ui::AX_ROLE_RADIO_GROUP, NSAccessibilityRadioGroupRole}, 100 {ui::AX_ROLE_RADIO_GROUP, NSAccessibilityRadioGroupRole},
101 {ui::AX_ROLE_REGION, NSAccessibilityGroupRole}, 101 {ui::AX_ROLE_REGION, NSAccessibilityGroupRole},
102 {ui::AX_ROLE_ROOT_WEB_AREA, @"AXWebArea"}, 102 {ui::AX_ROLE_ROOT_WEB_AREA, @"AXWebArea"},
103 {ui::AX_ROLE_ROW, NSAccessibilityRowRole}, 103 {ui::AX_ROLE_ROW, NSAccessibilityRowRole},
104 {ui::AX_ROLE_ROW_HEADER, @"AXCell"}, 104 {ui::AX_ROLE_ROW_HEADER, @"AXCell"},
105 {ui::AX_ROLE_RULER, NSAccessibilityRulerRole}, 105 {ui::AX_ROLE_RULER, NSAccessibilityRulerRole},
106 {ui::AX_ROLE_SCROLL_BAR, NSAccessibilityScrollBarRole}, 106 {ui::AX_ROLE_SCROLL_BAR, NSAccessibilityScrollBarRole},
107 {ui::AX_ROLE_SEARCH, NSAccessibilityGroupRole}, 107 {ui::AX_ROLE_SEARCH, NSAccessibilityGroupRole},
108 {ui::AX_ROLE_SEARCH_BOX, NSAccessibilityTextFieldRole},
108 {ui::AX_ROLE_SLIDER, NSAccessibilitySliderRole}, 109 {ui::AX_ROLE_SLIDER, NSAccessibilitySliderRole},
109 {ui::AX_ROLE_SLIDER_THUMB, NSAccessibilityValueIndicatorRole}, 110 {ui::AX_ROLE_SLIDER_THUMB, NSAccessibilityValueIndicatorRole},
110 {ui::AX_ROLE_SPIN_BUTTON, NSAccessibilityIncrementorRole}, 111 {ui::AX_ROLE_SPIN_BUTTON, NSAccessibilityIncrementorRole},
111 {ui::AX_ROLE_SPLITTER, NSAccessibilitySplitterRole}, 112 {ui::AX_ROLE_SPLITTER, NSAccessibilitySplitterRole},
112 {ui::AX_ROLE_STATIC_TEXT, NSAccessibilityStaticTextRole}, 113 {ui::AX_ROLE_STATIC_TEXT, NSAccessibilityStaticTextRole},
113 {ui::AX_ROLE_STATUS, NSAccessibilityGroupRole}, 114 {ui::AX_ROLE_STATUS, NSAccessibilityGroupRole},
114 {ui::AX_ROLE_SVG_ROOT, NSAccessibilityGroupRole}, 115 {ui::AX_ROLE_SVG_ROOT, NSAccessibilityGroupRole},
116 {ui::AX_ROLE_SWITCH, NSAccessibilityCheckBoxRole},
115 {ui::AX_ROLE_TAB, NSAccessibilityRadioButtonRole}, 117 {ui::AX_ROLE_TAB, NSAccessibilityRadioButtonRole},
116 {ui::AX_ROLE_TABLE, NSAccessibilityTableRole}, 118 {ui::AX_ROLE_TABLE, NSAccessibilityTableRole},
117 {ui::AX_ROLE_TABLE_HEADER_CONTAINER, NSAccessibilityGroupRole}, 119 {ui::AX_ROLE_TABLE_HEADER_CONTAINER, NSAccessibilityGroupRole},
118 {ui::AX_ROLE_TAB_LIST, NSAccessibilityTabGroupRole}, 120 {ui::AX_ROLE_TAB_LIST, NSAccessibilityTabGroupRole},
119 {ui::AX_ROLE_TAB_PANEL, NSAccessibilityGroupRole}, 121 {ui::AX_ROLE_TAB_PANEL, NSAccessibilityGroupRole},
120 {ui::AX_ROLE_TEXT_AREA, NSAccessibilityTextAreaRole}, 122 {ui::AX_ROLE_TEXT_AREA, NSAccessibilityTextAreaRole},
121 {ui::AX_ROLE_TEXT_FIELD, NSAccessibilityTextFieldRole}, 123 {ui::AX_ROLE_TEXT_FIELD, NSAccessibilityTextFieldRole},
122 {ui::AX_ROLE_TIME, @"AXTimeField"}, 124 {ui::AX_ROLE_TIME, @"AXTimeField"},
123 {ui::AX_ROLE_TIMER, NSAccessibilityGroupRole}, 125 {ui::AX_ROLE_TIMER, NSAccessibilityGroupRole},
124 {ui::AX_ROLE_TOGGLE_BUTTON, NSAccessibilityCheckBoxRole}, 126 {ui::AX_ROLE_TOGGLE_BUTTON, NSAccessibilityCheckBoxRole},
(...skipping 13 matching lines...) Expand all
138 RoleMap role_map; 140 RoleMap role_map;
139 for (size_t i = 0; i < arraysize(roles); ++i) 141 for (size_t i = 0; i < arraysize(roles); ++i)
140 role_map[roles[i].value] = roles[i].nativeValue; 142 role_map[roles[i].value] = roles[i].nativeValue;
141 return role_map; 143 return role_map;
142 } 144 }
143 145
144 RoleMap BuildSubroleMap() { 146 RoleMap BuildSubroleMap() {
145 const MapEntry subroles[] = { 147 const MapEntry subroles[] = {
146 {ui::AX_ROLE_ALERT, @"AXApplicationAlert"}, 148 {ui::AX_ROLE_ALERT, @"AXApplicationAlert"},
147 {ui::AX_ROLE_ALERT_DIALOG, @"AXApplicationAlertDialog"}, 149 {ui::AX_ROLE_ALERT_DIALOG, @"AXApplicationAlertDialog"},
150 {ui::AX_ROLE_APPLICATION, @"AXLandmarkApplication"},
148 {ui::AX_ROLE_ARTICLE, @"AXDocumentArticle"}, 151 {ui::AX_ROLE_ARTICLE, @"AXDocumentArticle"},
152 {ui::AX_ROLE_BANNER, @"AXLandmarkBanner"},
153 {ui::AX_ROLE_COMPLEMENTARY, @"AXLandmarkComplementary"},
154 {ui::AX_ROLE_CONTENT_INFO, @"AXLandmarkContentInfo"},
149 {ui::AX_ROLE_DEFINITION, @"AXDefinition"}, 155 {ui::AX_ROLE_DEFINITION, @"AXDefinition"},
150 {ui::AX_ROLE_DESCRIPTION_LIST_DETAIL, @"AXDefinition"}, 156 {ui::AX_ROLE_DESCRIPTION_LIST_DETAIL, @"AXDefinition"},
151 {ui::AX_ROLE_DESCRIPTION_LIST_TERM, @"AXTerm"}, 157 {ui::AX_ROLE_DESCRIPTION_LIST_TERM, @"AXTerm"},
152 {ui::AX_ROLE_DIALOG, @"AXApplicationDialog"}, 158 {ui::AX_ROLE_DIALOG, @"AXApplicationDialog"},
153 {ui::AX_ROLE_DOCUMENT, @"AXDocument"}, 159 {ui::AX_ROLE_DOCUMENT, @"AXDocument"},
154 {ui::AX_ROLE_FOOTER, @"AXLandmarkContentInfo"}, 160 {ui::AX_ROLE_FOOTER, @"AXLandmarkContentInfo"},
155 {ui::AX_ROLE_APPLICATION, @"AXLandmarkApplication"},
156 {ui::AX_ROLE_BANNER, @"AXLandmarkBanner"},
157 {ui::AX_ROLE_COMPLEMENTARY, @"AXLandmarkComplementary"},
158 {ui::AX_ROLE_CONTENT_INFO, @"AXLandmarkContentInfo"},
159 {ui::AX_ROLE_MAIN, @"AXLandmarkMain"},
160 {ui::AX_ROLE_NAVIGATION, @"AXLandmarkNavigation"},
161 {ui::AX_ROLE_SEARCH, @"AXLandmarkSearch"},
162 {ui::AX_ROLE_FORM, @"AXLandmarkForm"}, 161 {ui::AX_ROLE_FORM, @"AXLandmarkForm"},
163 {ui::AX_ROLE_LOG, @"AXApplicationLog"}, 162 {ui::AX_ROLE_LOG, @"AXApplicationLog"},
163 {ui::AX_ROLE_MAIN, @"AXLandmarkMain"},
164 {ui::AX_ROLE_MARQUEE, @"AXApplicationMarquee"}, 164 {ui::AX_ROLE_MARQUEE, @"AXApplicationMarquee"},
165 {ui::AX_ROLE_MATH, @"AXDocumentMath"}, 165 {ui::AX_ROLE_MATH, @"AXDocumentMath"},
166 {ui::AX_ROLE_NAVIGATION, @"AXLandmarkNavigation"},
166 {ui::AX_ROLE_NOTE, @"AXDocumentNote"}, 167 {ui::AX_ROLE_NOTE, @"AXDocumentNote"},
167 {ui::AX_ROLE_REGION, @"AXDocumentRegion"}, 168 {ui::AX_ROLE_REGION, @"AXDocumentRegion"},
169 {ui::AX_ROLE_SEARCH, @"AXLandmarkSearch"},
170 {ui::AX_ROLE_SEARCH_BOX, @"AXSearchField"},
168 {ui::AX_ROLE_STATUS, @"AXApplicationStatus"}, 171 {ui::AX_ROLE_STATUS, @"AXApplicationStatus"},
172 {ui::AX_ROLE_SWITCH, @"AXSwitch"},
169 {ui::AX_ROLE_TAB_PANEL, @"AXTabPanel"}, 173 {ui::AX_ROLE_TAB_PANEL, @"AXTabPanel"},
170 {ui::AX_ROLE_TIMER, @"AXApplicationTimer"}, 174 {ui::AX_ROLE_TIMER, @"AXApplicationTimer"},
171 {ui::AX_ROLE_TOGGLE_BUTTON, @"AXToggleButton"}, 175 {ui::AX_ROLE_TOGGLE_BUTTON, @"AXToggleButton"},
172 {ui::AX_ROLE_TOOLTIP, @"AXUserInterfaceTooltip"}, 176 {ui::AX_ROLE_TOOLTIP, @"AXUserInterfaceTooltip"},
173 {ui::AX_ROLE_TREE_ITEM, NSAccessibilityOutlineRowSubrole}, 177 {ui::AX_ROLE_TREE_ITEM, NSAccessibilityOutlineRowSubrole},
174 }; 178 };
175 179
176 RoleMap subrole_map; 180 RoleMap subrole_map;
177 for (size_t i = 0; i < arraysize(subroles); ++i) 181 for (size_t i = 0; i < arraysize(subroles); ++i)
178 subrole_map[subroles[i].value] = subroles[i].nativeValue; 182 subrole_map[subroles[i].value] = subroles[i].nativeValue;
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 void AXPlatformNodeMac::NotifyAccessibilityEvent(ui::AXEvent event_type) { 333 void AXPlatformNodeMac::NotifyAccessibilityEvent(ui::AXEvent event_type) {
330 // TODO(dmazzoni): implement this. http://crbug.com/396137 334 // TODO(dmazzoni): implement this. http://crbug.com/396137
331 } 335 }
332 336
333 int AXPlatformNodeMac::GetIndexInParent() { 337 int AXPlatformNodeMac::GetIndexInParent() {
334 // TODO(dmazzoni): implement this. http://crbug.com/396137 338 // TODO(dmazzoni): implement this. http://crbug.com/396137
335 return -1; 339 return -1;
336 } 340 }
337 341
338 } // namespace ui 342 } // namespace ui
OLDNEW
« no previous file with comments | « ui/accessibility/ax_enums.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698