Replace ui::AXViewState with AXNodeData and AXActionData

ui/views/controls/combobox/combobox.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/combobox/combobox.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "build/build_config.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/default_style.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/base/models/combobox_model_observer.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 701 matching lines @@
     GetInputMethod()->DetachTextInputClient(GetPrefixSelector());
 
   if (selector_)
     selector_->OnViewBlur();
   // Border renders differently when focused.
   SchedulePaint();
   if (UseMd())
     FocusRing::Uninstall(this);
 }
 
-void Combobox::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_COMBO_BOX;
-  state->name = accessible_name_;
-  state->value = model_->GetItemAt(selected_index_);
-  state->index = selected_index_;
-  state->count = model_->GetItemCount();
+void Combobox::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ui::AX_ROLE_COMBO_BOX;
+  node_data->SetName(accessible_name_);
+  node_data->SetValue(model_->GetItemAt(selected_index_));
+  node_data->AddIntAttribute(ui::AX_ATTR_POS_IN_SET, selected_index_);
+  node_data->AddIntAttribute(ui::AX_ATTR_SET_SIZE, model_->GetItemCount());
 }
 
 void Combobox::ButtonPressed(Button* sender, const ui::Event& event) {
   if (!enabled())
     return;
 
   if (!UseMd())
     RequestFocus();
 
   if (sender == text_button_) {
@@ skipping 242 matching lines @@
   const int kMdPaddingWidth = 8;
   int arrow_pad = UseMd() ? kMdPaddingWidth
                           : PlatformStyle::kComboboxNormalArrowPadding;
   int padding = style_ == STYLE_NORMAL
                     ? arrow_pad * 2
                     : kActionLeftPadding + kActionRightPadding;
   return ArrowSize().width() + padding;
 }
 
 }  // namespace views