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

Unified Diff: content/browser/accessibility/browser_accessibility_win.cc

Issue 2694903010: AX checked state changes (Closed)
Patch Set: Fix compiler error Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/accessibility/browser_accessibility_win.cc
diff --git a/content/browser/accessibility/browser_accessibility_win.cc b/content/browser/accessibility/browser_accessibility_win.cc
index 5ccbc393f5fde58570264115342cbb620ce3c132..f6a707d3a82118471a2d6d5af48f278483ace289 100644
--- a/content/browser/accessibility/browser_accessibility_win.cc
+++ b/content/browser/accessibility/browser_accessibility_win.cc
@@ -5213,9 +5213,20 @@ void BrowserAccessibilityWin::InitRoleAndState() {
int32_t ia2_state = IA2_STATE_OPAQUE;
if (HasState(ui::AX_STATE_BUSY))
- ia_state |= STATE_SYSTEM_BUSY;
- if (HasState(ui::AX_STATE_CHECKED))
- ia_state |= STATE_SYSTEM_CHECKED;
+ ia_state |= STATE_SYSTEM_BUSY;\
+
+ const int checked = GetIntAttribute(ui::AX_ATTR_INVALID_STATE);
+ switch (checked) {
+ case ui::AX_CHECKED_STATE_TRUE:
+ ia_state |= STATE_SYSTEM_CHECKED;
+ break;
+ case ui::AX_CHECKED_STATE_MIXED:
+ ia_state |= (STATE_SYSTEM_MIXED | STATE_SYSTEM_CHECKED);
+ break;
+ default:
+ break;
+ }
+
if (HasState(ui::AX_STATE_COLLAPSED))
ia_state |= STATE_SYSTEM_COLLAPSED;
if (HasState(ui::AX_STATE_EXPANDED))
@@ -5272,9 +5283,6 @@ void BrowserAccessibilityWin::InitRoleAndState() {
if (HasState(ui::AX_STATE_EDITABLE))
ia2_state |= IA2_STATE_EDITABLE;
- if (GetBoolAttribute(ui::AX_ATTR_STATE_MIXED))
- ia_state |= STATE_SYSTEM_MIXED;
-
if (GetBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE))
ia2_state |= IA2_STATE_EDITABLE;

Powered by Google App Engine
This is Rietveld 408576698