diff --git a/shell/platform/common/accessibility_bridge.cc b/shell/platform/common/accessibility_bridge.cc index db5f507fe8488..9a6e02065ee64 100644 --- a/shell/platform/common/accessibility_bridge.cc +++ b/shell/platform/common/accessibility_bridge.cc @@ -333,7 +333,7 @@ void AccessibilityBridge::SetRoleFromFlutterUpdate(ui::AXNodeData& node_data, return; } if (flags & kFlutterSemanticsFlagHasToggledState) { - node_data.role = ax::mojom::Role::kToggleButton; + node_data.role = ax::mojom::Role::kSwitch; return; } if (flags & kFlutterSemanticsFlagIsSlider) { @@ -477,7 +477,7 @@ void AccessibilityBridge::SetIntAttributesFromFlutterUpdate( : flags & FlutterSemanticsFlag::kFlutterSemanticsFlagIsChecked ? ax::mojom::CheckedState::kTrue : ax::mojom::CheckedState::kFalse)); - } else if (node_data.role == ax::mojom::Role::kToggleButton) { + } else if (node_data.role == ax::mojom::Role::kSwitch) { node_data.AddIntAttribute( ax::mojom::IntAttribute::kCheckedState, static_cast( diff --git a/shell/platform/common/accessibility_bridge_unittests.cc b/shell/platform/common/accessibility_bridge_unittests.cc index fb0c839b7734e..796670e3ab9b0 100644 --- a/shell/platform/common/accessibility_bridge_unittests.cc +++ b/shell/platform/common/accessibility_bridge_unittests.cc @@ -253,7 +253,7 @@ TEST(AccessibilityBridgeTest, DoesNotAssignEditableRootToSelectableText) { ax::mojom::BoolAttribute::kEditableRoot)); } -TEST(AccessibilityBridgeTest, ToggleHasToggleButtonRole) { +TEST(AccessibilityBridgeTest, SwitchHasSwitchRole) { std::shared_ptr bridge = std::make_shared(); FlutterSemanticsNode2 root = CreateSemanticsNode(0, "root"); @@ -265,7 +265,7 @@ TEST(AccessibilityBridgeTest, ToggleHasToggleButtonRole) { bridge->CommitUpdates(); auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock(); - EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton); + EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch); } TEST(AccessibilityBridgeTest, SliderHasSliderRole) { diff --git a/shell/platform/windows/flutter_windows_view_unittests.cc b/shell/platform/windows/flutter_windows_view_unittests.cc index 6f4d5fc85650f..39cea644c78dc 100644 --- a/shell/platform/windows/flutter_windows_view_unittests.cc +++ b/shell/platform/windows/flutter_windows_view_unittests.cc @@ -1081,7 +1081,7 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) { { auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock(); - EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton); + EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch); EXPECT_EQ(root_node->GetData().GetCheckedState(), ax::mojom::CheckedState::kTrue); @@ -1104,6 +1104,7 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) { VARIANT native_state = {}; ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state))); EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_PRESSED); + EXPECT_TRUE(native_state.lVal & STATE_SYSTEM_CHECKED); // Test similarly on UIA node. IRawElementProviderSimple* uia_node; @@ -1129,7 +1130,7 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) { { auto root_node = bridge->GetFlutterPlatformNodeDelegateFromID(0).lock(); - EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kToggleButton); + EXPECT_EQ(root_node->GetData().role, ax::mojom::Role::kSwitch); EXPECT_EQ(root_node->GetData().GetCheckedState(), ax::mojom::CheckedState::kFalse); @@ -1146,6 +1147,7 @@ TEST(FlutterWindowsViewTest, SwitchNativeState) { VARIANT native_state = {}; ASSERT_TRUE(SUCCEEDED(native_view->get_accState(varchild, &native_state))); EXPECT_FALSE(native_state.lVal & STATE_SYSTEM_PRESSED); + EXPECT_FALSE(native_state.lVal & STATE_SYSTEM_CHECKED); // Test similarly on UIA node. IRawElementProviderSimple* uia_node;