Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/accessibility/ax_view_obj_wrapper.cc

 // Copyright 2014 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/accessibility/ax_view_obj_wrapper.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/event_utils.h"
 #include "ui/views/accessibility/ax_aura_obj_cache.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 AXViewObjWrapper::AXViewObjWrapper(View* view)  : view_(view) {
   if (view->GetWidget())
     AXAuraObjCache::GetInstance()->GetOrCreate(view->GetWidget());
@@ skipping 19 matching lines @@
     if (!view_->child_at(i)->visible())
       continue;
 
     AXAuraObjWrapper* child =
         AXAuraObjCache::GetInstance()->GetOrCreate(view_->child_at(i));
     out_children->push_back(child);
   }
 }
 
 void AXViewObjWrapper::Serialize(ui::AXNodeData* out_node_data) {
-  ui::AXViewState view_data;
-  view_->GetAccessibleState(&view_data);
+  out_node_data->state = 0;
+  view_->GetAccessibleNodeData(out_node_data);
 
   out_node_data->id = GetID();
-  out_node_data->role = view_data.role;
 
-  out_node_data->state = view_data.state();
   if (view_->IsFocusable())
     out_node_data->state |= 1 << ui::AX_STATE_FOCUSABLE;
   if (!view_->visible())
     out_node_data->state |= 1 << ui::AX_STATE_INVISIBLE;
 
   out_node_data->location = gfx::RectF(view_->GetBoundsInScreen());
-
-  out_node_data->AddStringAttribute(
-      ui::AX_ATTR_NAME, base::UTF16ToUTF8(view_data.name));
-  out_node_data->AddStringAttribute(
-      ui::AX_ATTR_VALUE, base::UTF16ToUTF8(view_data.value));
-
-  if (view_data.selection_start > -1 && view_data.selection_end > -1) {
-    out_node_data->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_START,
-                                   view_data.selection_start);
-
-    out_node_data->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_END,
-                                   view_data.selection_end);
-  }
 }
 
 int32_t AXViewObjWrapper::GetID() {
   return AXAuraObjCache::GetInstance()->GetID(view_);
 }
 
 void AXViewObjWrapper::DoDefault() {
   gfx::Rect rect = view_->GetLocalBounds();
   gfx::Point center = rect.CenterPoint();
   view_->OnMousePressed(ui::MouseEvent(
@@ skipping 15 matching lines @@
 void AXViewObjWrapper::SetSelection(int32_t start, int32_t end) {
   // TODO(dtseng): Implement.
 }
 
 void AXViewObjWrapper::ShowContextMenu() {
   view_->ShowContextMenu(view_->bounds().CenterPoint(),
                          ui::MENU_SOURCE_KEYBOARD);
 }
 
 }  // namespace views