Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/menu/menu_item_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/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.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/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/resources/grit/ui_resources.h"
@@ skipping 123 matching lines @@
   }
 
   const MenuDelegate* delegate = GetDelegate();
   CHECK(delegate);
   gfx::Point location(p);
   ConvertPointToScreen(this, &location);
   *tooltip = delegate->GetTooltipText(command_, location);
   return !tooltip->empty();
 }
 
-void MenuItemView::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_MENU_ITEM;
+void MenuItemView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ui::AX_ROLE_MENU_ITEM;
 
   base::string16 item_text;
   if (IsContainer()) {
     // The first child is taking over, just use its accessible name instead of
     // |title_|.
     View* child = child_at(0);
-    ui::AXViewState state;
-    child->GetAccessibleState(&state);
-    item_text = state.name;
+    ui::AXNodeData node_data;
+    child->GetAccessibleNodeData(&node_data);
+    item_text = node_data.GetString16Attribute(ui::AX_ATTR_NAME);
   } else {
     item_text = title_;
   }
-  state->name = GetAccessibleNameForMenuItem(item_text, GetMinorText());
+  node_data->SetName(GetAccessibleNameForMenuItem(item_text, GetMinorText()));
 
   switch (GetType()) {
     case SUBMENU:
-      state->AddStateFlag(ui::AX_STATE_HASPOPUP);
+      node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
       break;
     case CHECKBOX:
     case RADIO:
       if (GetDelegate()->IsItemChecked(GetCommand()))
-        state->AddStateFlag(ui::AX_STATE_CHECKED);
+        node_data->AddStateFlag(ui::AX_STATE_CHECKED);
       break;
     case NORMAL:
     case SEPARATOR:
     case EMPTY:
       // No additional accessibility states currently for these menu states.
       break;
   }
 }
 
 // static
@@ skipping 888 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views