Chromium Code Reviews| Index: ui/views/controls/combobox/combobox_unittest.cc |
| diff --git a/ui/views/controls/combobox/combobox_unittest.cc b/ui/views/controls/combobox/combobox_unittest.cc |
| index 31a0c159ddf6c5a6e87c883b8220c7f486878131..fb85a99e576519802e86fb653f48826cbe0a09b6 100644 |
| --- a/ui/views/controls/combobox/combobox_unittest.cc |
| +++ b/ui/views/controls/combobox/combobox_unittest.cc |
| @@ -9,6 +9,7 @@ |
| #include "base/macros.h" |
| #include "base/strings/utf_string_conversions.h" |
| #include "build/build_config.h" |
| +#include "ui/accessibility/ax_action_data.h" |
| #include "ui/base/ime/input_method.h" |
| #include "ui/base/ime/text_input_client.h" |
| #include "ui/base/models/combobox_model.h" |
| @@ -642,6 +643,36 @@ TEST_F(ComboboxTest, NotifyOnClickWithSpaceKey) { |
| EXPECT_FALSE(listener.on_perform_action_called()); |
| } |
| +// Test that accessibility action events show the combobox dropdown. |
| +TEST_F(ComboboxTest, ShowViaAccessibleAction) { |
| + InitCombobox(nullptr, Combobox::STYLE_NORMAL); |
| + |
| + ui::AXActionData data; |
| + data.action = ui::AX_ACTION_DO_DEFAULT; |
| + |
| + EXPECT_EQ(0, menu_show_count_); |
| + combobox_->HandleAccessibleAction(data); |
| + EXPECT_EQ(1, menu_show_count_); |
| + |
| + // AX_ACTION_SHOW_CONTEXT_MENU is specifically for a context menu (e.g. right- |
| + // click). Combobox should ignore it. |
| + data.action = ui::AX_ACTION_SHOW_CONTEXT_MENU; |
| + combobox_->HandleAccessibleAction(data); |
| + EXPECT_EQ(1, menu_show_count_); // No change. |
| + |
| + data.action = ui::AX_ACTION_BLUR; |
| + combobox_->HandleAccessibleAction(data); |
| + EXPECT_EQ(1, menu_show_count_); // No change. |
| + |
| + combobox_->SetEnabled(false); |
| + combobox_->HandleAccessibleAction(data); |
| + EXPECT_EQ(1, menu_show_count_); // No change. |
| + |
| + data.action = ui::AX_ACTION_BLUR; |
|
msw
2017/06/30 15:40:07
Change this to data.action = ui::AX_ACTION_DO_DEFA
tapted
2017/07/03 04:12:23
Done.
|
| + combobox_->HandleAccessibleAction(data); |
| + EXPECT_EQ(1, menu_show_count_); // No change. |
| +} |
| + |
| TEST_F(ComboboxTest, NotifyOnClickWithSpaceKeyActionStyle) { |
| InitCombobox(nullptr, Combobox::STYLE_ACTION); |