summaryrefslogtreecommitdiffstats
path: root/content/browser/accessibility/browser_accessibility_win.cc
diff options
context:
space:
mode:
authorshreeram.k <shreeram.k@samsung.com>2015-03-27 03:36:27 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-27 10:37:18 +0000
commitb0ec609a1fc0f4512bb16d906ff4627e485955f8 (patch)
tree8c050ab22310e80fd6805400000e29d74319a0e5 /content/browser/accessibility/browser_accessibility_win.cc
parent22fa94fe6be395c363d222b1262c9e8239c6aabc (diff)
downloadchromium_src-b0ec609a1fc0f4512bb16d906ff4627e485955f8.zip
chromium_src-b0ec609a1fc0f4512bb16d906ff4627e485955f8.tar.gz
chromium_src-b0ec609a1fc0f4512bb16d906ff4627e485955f8.tar.bz2
Chromium side Implementation of new roles added in ARIA 1.1 draft.
Following roles has been mapped for win,mac & android platform. 1. switch role 2. searchbox role Also some cleanups are done in this CL. BUG=468667 Review URL: https://codereview.chromium.org/1030333002 Cr-Commit-Position: refs/heads/master@{#322544}
Diffstat (limited to 'content/browser/accessibility/browser_accessibility_win.cc')
-rw-r--r--content/browser/accessibility/browser_accessibility_win.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 228fb63..5c318b2 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -3861,10 +3861,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia_role = ROLE_SYSTEM_TEXT;
ia2_role = IA2_ROLE_LABEL;
break;
- case ui::AX_ROLE_SEARCH:
- ia_role = ROLE_SYSTEM_GROUPING;
- ia2_role = IA2_ROLE_SECTION;
- break;
case ui::AX_ROLE_LINK:
ia_role = ROLE_SYSTEM_LINK;
ia_state |= STATE_SYSTEM_LINKED;
@@ -4002,6 +3998,10 @@ void BrowserAccessibilityWin::InitRoleAndState() {
case ui::AX_ROLE_SCROLL_BAR:
ia_role = ROLE_SYSTEM_SCROLLBAR;
break;
+ case ui::AX_ROLE_SEARCH:
+ ia_role = ROLE_SYSTEM_GROUPING;
+ ia2_role = IA2_ROLE_SECTION;
+ break;
case ui::AX_ROLE_SLIDER:
ia_role = ROLE_SYSTEM_SLIDER;
break;
@@ -4025,6 +4025,10 @@ void BrowserAccessibilityWin::InitRoleAndState() {
case ui::AX_ROLE_SVG_ROOT:
ia_role = ROLE_SYSTEM_GRAPHIC;
break;
+ case ui::AX_ROLE_SWITCH:
+ role_name = L"switch";
+ ia2_role = IA2_ROLE_TOGGLE_BUTTON;
+ break;
case ui::AX_ROLE_TAB:
ia_role = ROLE_SYSTEM_PAGETAB;
break;
@@ -4060,6 +4064,7 @@ void BrowserAccessibilityWin::InitRoleAndState() {
ia2_state |= IA2_STATE_SELECTABLE_TEXT;
break;
case ui::AX_ROLE_TEXT_FIELD:
+ case ui::AX_ROLE_SEARCH_BOX:
ia_role = ROLE_SYSTEM_TEXT;
ia2_state |= IA2_STATE_SINGLE_LINE;
ia2_state |= IA2_STATE_EDITABLE;