Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/table/table_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/table/table_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/table/table_grouper.h"
 #include "ui/views/controls/table/table_header.h"
@@ skipping 408 matching lines @@
 bool TableView::GetTooltipText(const gfx::Point& p,
                                base::string16* tooltip) const {
   return GetTooltipImpl(p, tooltip, NULL);
 }
 
 bool TableView::GetTooltipTextOrigin(const gfx::Point& p,
                                      gfx::Point* loc) const {
   return GetTooltipImpl(p, NULL, loc);
 }
 
-void TableView::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_TABLE;
-  state->AddStateFlag(ui::AX_STATE_READ_ONLY);
-  state->count = RowCount();
+void TableView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ui::AX_ROLE_TABLE;
+  node_data->AddStateFlag(ui::AX_STATE_READ_ONLY);
+  node_data->AddIntAttribute(ui::AX_ATTR_SET_SIZE, RowCount());
 
   if (selection_model_.active() != ui::ListSelectionModel::kUnselectedIndex) {
     // Get information about the active item, this is not the same as the set
     // of selected items (of which there could be more than one).
-    state->role = ui::AX_ROLE_ROW;
-    state->index = selection_model_.active();
+    node_data->role = ui::AX_ROLE_ROW;
+    node_data->AddIntAttribute(ui::AX_ATTR_POS_IN_SET,
+                               selection_model_.active());
     if (selection_model_.IsSelected(selection_model_.active())) {
-      state->AddStateFlag(ui::AX_STATE_SELECTED);
+      node_data->AddStateFlag(ui::AX_STATE_SELECTED);
     }
 
     std::vector<base::string16> name_parts;
     for (const VisibleColumn& visible_column : visible_columns_) {
       base::string16 value = model_->GetText(
           selection_model_.active(), visible_column.column.id);
       if (!value.empty()) {
         name_parts.push_back(visible_column.column.title);
         name_parts.push_back(value);
       }
     }
-    state->name = base::JoinString(name_parts, base::ASCIIToUTF16(", "));
+    node_data->SetName(base::JoinString(name_parts, base::ASCIIToUTF16(", ")));
   }
 }
 
 void TableView::OnModelChanged() {
   selection_model_.Clear();
   NumRowsChanged();
 }
 
 void TableView::OnItemsChanged(int start, int length) {
   SortItemsAndUpdateMapping();
@@ skipping 477 matching lines @@
   if (tooltip)
     *tooltip = text;
   if (tooltip_origin) {
     tooltip_origin->SetPoint(cell_bounds.x(),
                              cell_bounds.y() + kTextVerticalPadding);
   }
   return true;
 }
 
 }  // namespace views