| Index: ui/views/controls/menu/menu_scroll_view_container.cc
|
| diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
|
| index 0612dfff91a44aca7c3f9833e3190aa5470b487a..4cfb02046087526570df87d7d57fed42d7764eda 100644
|
| --- a/ui/views/controls/menu/menu_scroll_view_container.cc
|
| +++ b/ui/views/controls/menu/menu_scroll_view_container.cc
|
| @@ -8,7 +8,7 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "third_party/skia/include/core/SkPaint.h"
|
| #include "third_party/skia/include/core/SkPath.h"
|
| -#include "ui/accessibility/ax_view_state.h"
|
| +#include "ui/accessibility/ax_node_data.h"
|
| #include "ui/gfx/canvas.h"
|
| #include "ui/gfx/color_palette.h"
|
| #include "ui/views/border.h"
|
| @@ -256,11 +256,10 @@ void MenuScrollViewContainer::OnPaintBackground(gfx::Canvas* canvas) {
|
| NativeTheme::kMenuPopupBackground, NativeTheme::kNormal, bounds, extra);
|
| }
|
|
|
| -void MenuScrollViewContainer::GetAccessibleState(
|
| - ui::AXViewState* state) {
|
| +void MenuScrollViewContainer::GetAccessibleNodeData(ui::AXNodeData* node_data) {
|
| // Get the name from the submenu view.
|
| - content_view_->GetAccessibleState(state);
|
| - state->role = ui::AX_ROLE_MENU_BAR;
|
| + content_view_->GetAccessibleNodeData(node_data);
|
| + node_data->role = ui::AX_ROLE_MENU_BAR;
|
| }
|
|
|
| void MenuScrollViewContainer::OnBoundsChanged(
|
|
|