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

Unified Diff: ui/accessibility/platform/ax_platform_node_win.cc

Issue 2707263011: Test aria-pressed=mixed on windows (Closed)
Patch Set: git cl try Created 3 years, 7 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
« no previous file with comments | « ui/accessibility/platform/ax_platform_node_auralinux.cc ('k') | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/accessibility/platform/ax_platform_node_win.cc
diff --git a/ui/accessibility/platform/ax_platform_node_win.cc b/ui/accessibility/platform/ax_platform_node_win.cc
index 6dcdc91e23134602f6be614e7d9fd9f4f6b9761c..dabdd1b2225d2b151a8c08b0a06f157f4ec360bd 100644
--- a/ui/accessibility/platform/ax_platform_node_win.cc
+++ b/ui/accessibility/platform/ax_platform_node_win.cc
@@ -1125,8 +1125,6 @@ int AXPlatformNodeWin::MSAAState() {
msaa_state |= STATE_SYSTEM_LINKED;
if (state & (1 << ui::AX_STATE_OFFSCREEN))
msaa_state |= STATE_SYSTEM_OFFSCREEN;
- if (state & (1 << ui::AX_STATE_PRESSED))
- msaa_state |= STATE_SYSTEM_PRESSED;
if (state & (1 << ui::AX_STATE_PROTECTED))
msaa_state |= STATE_SYSTEM_PROTECTED;
if (state & (1 << ui::AX_STATE_READ_ONLY))
@@ -1139,13 +1137,27 @@ int AXPlatformNodeWin::MSAAState() {
msaa_state |= STATE_SYSTEM_UNAVAILABLE;
// Checked state
- const auto checked_state = static_cast<ui::AXCheckedState>(
+ const auto checked_state = static_cast<ui::AXButtonState>(
GetIntAttribute(ui::AX_ATTR_CHECKED_STATE));
switch (checked_state) {
- case ui::AX_CHECKED_STATE_TRUE:
+ case ui::AX_BUTTON_STATE_TRUE:
msaa_state |= STATE_SYSTEM_CHECKED;
break;
- case ui::AX_CHECKED_STATE_MIXED:
+ case ui::AX_BUTTON_STATE_MIXED:
+ msaa_state |= STATE_SYSTEM_MIXED;
+ break;
+ default:
+ break;
+ }
+
+ // Pressed state
+ const auto pressed_state = static_cast<ui::AXButtonState>(
+ GetIntAttribute(ui::AX_ATTR_PRESSED_STATE));
+ switch (pressed_state) {
+ case ui::AX_BUTTON_STATE_TRUE:
+ msaa_state |= STATE_SYSTEM_CHECKED;
+ break;
+ case ui::AX_BUTTON_STATE_MIXED:
msaa_state |= STATE_SYSTEM_MIXED;
break;
default:
« no previous file with comments | « ui/accessibility/platform/ax_platform_node_auralinux.cc ('k') | ui/views/controls/button/checkbox.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698