summaryrefslogtreecommitdiffstats
path: root/views/accessibility
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 05:45:33 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-16 05:45:33 +0000
commit791199c674cd1aa2997e39079e33681596866fc8 (patch)
tree9d8837dfd5273300585ef082c993b4a7fe1ed976 /views/accessibility
parent0546c189a55fb6043b69a99cae098e00758a4cb5 (diff)
downloadchromium_src-791199c674cd1aa2997e39079e33681596866fc8.zip
chromium_src-791199c674cd1aa2997e39079e33681596866fc8.tar.gz
chromium_src-791199c674cd1aa2997e39079e33681596866fc8.tar.bz2
Reapply r41640.
Original patch by thiago.farina@gmail.com Revision r41640 was reverted in r41676 because it looked like it might have been responsible for Interactive UI test failures in linux and windows. However, reverting didn't fix, so I'm reapplying it. Review URL: http://codereview.chromium.org/982004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accessibility')
-rw-r--r--views/accessibility/accessibility_types.h2
-rw-r--r--views/accessibility/view_accessibility.cc4
2 files changed, 6 insertions, 0 deletions
diff --git a/views/accessibility/accessibility_types.h b/views/accessibility/accessibility_types.h
index e3bdfae..cc92d0c 100644
--- a/views/accessibility/accessibility_types.h
+++ b/views/accessibility/accessibility_types.h
@@ -25,8 +25,10 @@ class AccessibilityTypes {
ROLE_BUTTONMENU,
ROLE_CHECKBUTTON,
ROLE_CLIENT,
+ ROLE_COMBOBOX,
ROLE_GRAPHIC,
ROLE_GROUPING,
+ ROLE_LINK,
ROLE_PAGETAB,
ROLE_PAGETABLIST,
ROLE_PUSHBUTTON,
diff --git a/views/accessibility/view_accessibility.cc b/views/accessibility/view_accessibility.cc
index f6c83eb..f8bf516 100644
--- a/views/accessibility/view_accessibility.cc
+++ b/views/accessibility/view_accessibility.cc
@@ -676,10 +676,14 @@ long ViewAccessibility::MSAARole(AccessibilityTypes::Role role) {
return ROLE_SYSTEM_BUTTONMENU;
case AccessibilityTypes::ROLE_CHECKBUTTON:
return ROLE_SYSTEM_CHECKBUTTON;
+ case AccessibilityTypes::ROLE_COMBOBOX:
+ return ROLE_SYSTEM_COMBOBOX;
case AccessibilityTypes::ROLE_GRAPHIC:
return ROLE_SYSTEM_GRAPHIC;
case AccessibilityTypes::ROLE_GROUPING:
return ROLE_SYSTEM_GROUPING;
+ case AccessibilityTypes::ROLE_LINK:
+ return ROLE_SYSTEM_LINK;
case AccessibilityTypes::ROLE_PAGETAB:
return ROLE_SYSTEM_PAGETAB;
case AccessibilityTypes::ROLE_PAGETABLIST: