Add all remaining roles in our role mapping array.

BUG=none
TEST=write a test to ensure that WebAccessibility::Role has the same number of entries as the Mac specific one.


Review URL: http://codereview.chromium.org/7185020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89599 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 43 insertions, 2 deletions

diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
index 22c249e..7ce1623 100644
--- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm
@@ -40,20 +40,38 @@ static const MapEntry roles[] = {
   { WebAccessibility::ROLE_NONE, NSAccessibilityUnknownRole },
   { WebAccessibility::ROLE_ALERT, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_ALERT_DIALOG, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_ANNOTATION, NSAccessibilityUnknownRole },
   { WebAccessibility::ROLE_APPLICATION, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_ARTICLE, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_BROWSER, NSAccessibilityBrowserRole },
+  { WebAccessibility::ROLE_BUSY_INDICATOR, NSAccessibilityBusyIndicatorRole },
   { WebAccessibility::ROLE_BUTTON, NSAccessibilityButtonRole },
   { WebAccessibility::ROLE_CELL, @"AXCell" },
   { WebAccessibility::ROLE_CHECKBOX, NSAccessibilityCheckBoxRole },
+  { WebAccessibility::ROLE_COLOR_WELL, NSAccessibilityColorWellRole },
   { WebAccessibility::ROLE_COLUMN, NSAccessibilityColumnRole },
-  { WebAccessibility::ROLE_COLUMN_HEADER, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_COLUMN_HEADER, @"AXCell" },
+  { WebAccessibility::ROLE_DEFINITION_LIST_DEFINITION,
+      NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_DEFINITION_LIST_TERM, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_DIALOG, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_DIRECTORY, NSAccessibilityListRole },
+  { WebAccessibility::ROLE_DISCLOSURE_TRIANGLE,
+      NSAccessibilityDisclosureTriangleRole },
   { WebAccessibility::ROLE_DOCUMENT, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_DRAWER, NSAccessibilityDrawerRole },
+  { WebAccessibility::ROLE_EDITABLE_TEXT, NSAccessibilityTextFieldRole },
   { WebAccessibility::ROLE_GRID, NSAccessibilityGridRole },
   { WebAccessibility::ROLE_GROUP, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_GROW_AREA, NSAccessibilityGrowAreaRole },
   { WebAccessibility::ROLE_HEADING, @"AXHeading" },
+  { WebAccessibility::ROLE_HELP_TAG, NSAccessibilityHelpTagRole },
   { WebAccessibility::ROLE_IGNORED, NSAccessibilityUnknownRole },
   { WebAccessibility::ROLE_IMAGE, NSAccessibilityImageRole },
+  { WebAccessibility::ROLE_IMAGE_MAP, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_IMAGE_MAP_LINK, NSAccessibilityLinkRole },
+  { WebAccessibility::ROLE_INCREMENTOR, NSAccessibilityIncrementorRole },
+  { WebAccessibility::ROLE_LANDMARK_APPLICATION, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_LANDMARK_BANNER, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_LANDMARK_COMPLEMENTARY, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_LANDMARK_CONTENTINFO, NSAccessibilityGroupRole },
@@ -64,21 +82,40 @@ static const MapEntry roles[] = {
   { WebAccessibility::ROLE_LINK, NSAccessibilityLinkRole },
   { WebAccessibility::ROLE_LIST, NSAccessibilityListRole },
   { WebAccessibility::ROLE_LIST_ITEM, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_LIST_MARKER, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_LISTBOX, NSAccessibilityListRole },
+  { WebAccessibility::ROLE_LISTBOX_OPTION, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_LOG, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_MARQUEE, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_MATH, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_MATTE, NSAccessibilityMatteRole },
+  { WebAccessibility::ROLE_MENU, NSAccessibilityMenuRole },
+  { WebAccessibility::ROLE_MENU_ITEM, NSAccessibilityMenuItemRole },
+  { WebAccessibility::ROLE_MENU_BUTTON, NSAccessibilityButtonRole },
+  { WebAccessibility::ROLE_MENU_LIST_OPTION, NSAccessibilityMenuItemRole },
+  { WebAccessibility::ROLE_MENU_LIST_POPUP, NSAccessibilityUnknownRole },
   { WebAccessibility::ROLE_NOTE, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_OUTLINE, NSAccessibilityOutlineRole },
   { WebAccessibility::ROLE_POPUP_BUTTON, NSAccessibilityPopUpButtonRole },
+  { WebAccessibility::ROLE_PROGRESS_INDICATOR,
+      NSAccessibilityProgressIndicatorRole },
   { WebAccessibility::ROLE_RADIO_BUTTON, NSAccessibilityRadioButtonRole },
   { WebAccessibility::ROLE_RADIO_GROUP, NSAccessibilityRadioGroupRole },
   { WebAccessibility::ROLE_REGION, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_ROW, NSAccessibilityRowRole },
-  { WebAccessibility::ROLE_ROW_HEADER, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_ROW_HEADER, @"AXCell" },
+  { WebAccessibility::ROLE_RULER, NSAccessibilityRulerRole },
+  { WebAccessibility::ROLE_RULER_MARKER, NSAccessibilityRulerMarkerRole },
   { WebAccessibility::ROLE_SCROLLAREA, NSAccessibilityScrollAreaRole },
   { WebAccessibility::ROLE_SCROLLBAR, NSAccessibilityScrollBarRole },
+  { WebAccessibility::ROLE_SHEET, NSAccessibilitySheetRole },
+  { WebAccessibility::ROLE_SLIDER, NSAccessibilitySliderRole },
+  { WebAccessibility::ROLE_SLIDER_THUMB, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_SPLITTER, NSAccessibilitySplitterRole },
+  { WebAccessibility::ROLE_SPLIT_GROUP, NSAccessibilitySplitGroupRole },
   { WebAccessibility::ROLE_STATIC_TEXT, NSAccessibilityStaticTextRole },
   { WebAccessibility::ROLE_STATUS, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_SYSTEM_WIDE, NSAccessibilityUnknownRole },
   { WebAccessibility::ROLE_TAB, NSAccessibilityRadioButtonRole },
   { WebAccessibility::ROLE_TAB_LIST, NSAccessibilityTabGroupRole },
   { WebAccessibility::ROLE_TAB_PANEL, NSAccessibilityGroupRole },
@@ -88,11 +125,15 @@ static const MapEntry roles[] = {
   { WebAccessibility::ROLE_TEXTAREA, NSAccessibilityTextAreaRole },
   { WebAccessibility::ROLE_TEXT_FIELD, NSAccessibilityTextFieldRole },
   { WebAccessibility::ROLE_TIMER, NSAccessibilityGroupRole },
+  { WebAccessibility::ROLE_TOOLBAR, NSAccessibilityToolbarRole },
   { WebAccessibility::ROLE_TOOLTIP, NSAccessibilityGroupRole },
   { WebAccessibility::ROLE_TREE, NSAccessibilityOutlineRole },
+  { WebAccessibility::ROLE_TREE_GRID, NSAccessibilityTableRole },
   { WebAccessibility::ROLE_TREE_ITEM, NSAccessibilityRowRole },
+  { WebAccessibility::ROLE_VALUE_INDICATOR, NSAccessibilityValueIndicatorRole },
   { WebAccessibility::ROLE_WEBCORE_LINK, NSAccessibilityLinkRole },
   { WebAccessibility::ROLE_WEB_AREA, @"AXWebArea" },
+  { WebAccessibility::ROLE_WINDOW, NSAccessibilityUnknownRole },
 };
 
 static const MapEntry subroles[] = {