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

Unified Diff: ui/views/controls/menu/menu_scroll_view_container.cc

Issue 2477463003: Replace ui::AXViewState with AXNodeData and AXActionData (Closed)
Patch Set: Fix test Created 4 years, 1 month 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/views/controls/menu/menu_scroll_view_container.h ('k') | ui/views/controls/menu/submenu_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ui/views/controls/menu/menu_scroll_view_container.h ('k') | ui/views/controls/menu/submenu_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698