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

Unified Diff: ui/accessibility/platform/ax_platform_node_auralinux.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/ax_tree_unittest.cc ('k') | ui/accessibility/platform/ax_platform_node_win.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_auralinux.cc
diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc
index 85a6ec09a0d8410e145b0807ec812f166730b4fd..3666bbcb6012fe83a7c501e068eafb2eef7c039d 100644
--- a/ui/accessibility/platform/ax_platform_node_auralinux.cc
+++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc
@@ -476,27 +476,38 @@ void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) {
atk_state_set_add_state(atk_state_set, ATK_STATE_EXPANDED);
if (data.HasState(ui::AX_STATE_FOCUSABLE))
atk_state_set_add_state(atk_state_set, ATK_STATE_FOCUSABLE);
- if (data.HasState(ui::AX_STATE_PRESSED))
- atk_state_set_add_state(atk_state_set, ATK_STATE_PRESSED);
if (data.HasState(ui::AX_STATE_SELECTABLE))
atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTABLE);
if (data.HasState(ui::AX_STATE_SELECTED))
atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTED);
// 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_MIXED:
+ case ui::AX_BUTTON_STATE_MIXED:
atk_state_set_add_state(atk_state_set, ATK_STATE_INDETERMINATE);
break;
- case ui::AX_CHECKED_STATE_TRUE:
+ case ui::AX_BUTTON_STATE_TRUE:
atk_state_set_add_state(atk_state_set, ATK_STATE_CHECKED);
break;
default:
break;
}
+ // Checked state
+ const auto pressed_state = static_cast<ui::AXButtonState>(
+ GetIntAttribute(ui::AX_ATTR_PRESSED_STATE));
+ switch (pressed_state) {
+ case ui::AX_BUTTON_STATE_MIXED:
+ atk_state_set_add_state(atk_state_set, ATK_STATE_INDETERMINATE);
+ break;
+ case ui::AX_BUTTON_STATE_TRUE:
+ atk_state_set_add_state(atk_state_set, ATK_STATE_PRESSED);
+ break;
+ default:
+ break;
+ }
if (delegate_->GetFocus() == GetNativeViewAccessible())
atk_state_set_add_state(atk_state_set, ATK_STATE_FOCUSED);
}
« no previous file with comments | « ui/accessibility/ax_tree_unittest.cc ('k') | ui/accessibility/platform/ax_platform_node_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698