| Index: ui/views/controls/button/menu_button.cc
|
| diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
|
| index 38fc310aa6246e9d9d260cf97c04b816ec265a9d..509cfae01a0709824743ad62735f270f9a82f6fe 100644
|
| --- a/ui/views/controls/button/menu_button.cc
|
| +++ b/ui/views/controls/button/menu_button.cc
|
| @@ -5,7 +5,7 @@
|
| #include "ui/views/controls/button/menu_button.h"
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "ui/accessibility/ax_view_state.h"
|
| +#include "ui/accessibility/ax_node_data.h"
|
| #include "ui/base/dragdrop/drag_drop_types.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| @@ -297,11 +297,12 @@ bool MenuButton::OnKeyReleased(const ui::KeyEvent& event) {
|
| return false;
|
| }
|
|
|
| -void MenuButton::GetAccessibleState(ui::AXViewState* state) {
|
| - CustomButton::GetAccessibleState(state);
|
| - state->role = ui::AX_ROLE_POP_UP_BUTTON;
|
| - state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
|
| - state->AddStateFlag(ui::AX_STATE_HASPOPUP);
|
| +void MenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
|
| + CustomButton::GetAccessibleNodeData(node_data);
|
| + node_data->role = ui::AX_ROLE_POP_UP_BUTTON;
|
| + node_data->AddStringAttribute(
|
| + ui::AX_ATTR_ACTION, l10n_util::GetStringUTF8(IDS_APP_ACCACTION_PRESS));
|
| + node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
|
| }
|
|
|
| void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
|
|
|