Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/menu/submenu_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/submenu_view.h"
 
 #include <algorithm>
 
 #include "base/compiler_specific.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_host.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
@@ skipping 153 matching lines @@
   int height = 0;
   int menu_item_width = width - insets.width();
   for (int i = 0; i < child_count(); ++i) {
     const View* child = child_at(i);
     height += child->visible() ? child->GetHeightForWidth(menu_item_width) : 0;
   }
 
   return gfx::Size(width, height + insets.height());
 }
 
-void SubmenuView::GetAccessibleState(ui::AXViewState* state) {
+void SubmenuView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   // Inherit most of the state from the parent menu item, except the role and
   // the orientation.
   if (GetMenuItem())
-    GetMenuItem()->GetAccessibleState(state);
-  state->role = ui::AX_ROLE_MENU_LIST_POPUP;
+    GetMenuItem()->GetAccessibleNodeData(node_data);
+  node_data->role = ui::AX_ROLE_MENU_LIST_POPUP;
   // Menus in Chrome are always traversed in a vertical direction.
-  state->AddStateFlag(ui::AX_STATE_VERTICAL);
+  node_data->AddStateFlag(ui::AX_STATE_VERTICAL);
 }
 
 void SubmenuView::PaintChildren(const ui::PaintContext& context) {
   View::PaintChildren(context);
 
   bool paint_drop_indicator = false;
   if (drop_item_) {
     switch (drop_position_) {
       case MenuDelegate::DROP_NONE:
       case MenuDelegate::DROP_ON:
@@ skipping 310 matching lines @@
   y = std::max(y, 0);
   gfx::Rect new_vis_bounds(x, y, vis_bounds.width(), vis_bounds.height());
   if (new_vis_bounds != vis_bounds) {
     ScrollRectToVisible(new_vis_bounds);
     return true;
   }
   return false;
 }
 
 }  // namespace views