Replace ui::AXViewState with AXNodeData and AXActionData

ash/common/system/ime/tray_ime_chromeos.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 "ash/common/system/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 10 matching lines @@
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_enums.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace tray {
 
 // A |HoverHighlightView| that uses bold or normal font depending on whether
 // it is selected.  This view exposes itself as a checkbox to the accessibility
 // framework.
 class SelectableHoverHighlightView : public HoverHighlightView {
  public:
   SelectableHoverHighlightView(ViewClickListener* listener,
                                const base::string16& label,
                                bool selected)
       : HoverHighlightView(listener), selected_(selected) {
     AddLabel(label, gfx::ALIGN_LEFT, selected);
   }
 
   ~SelectableHoverHighlightView() override {}
 
  protected:
   // Overridden from views::View.
-  void GetAccessibleState(ui::AXViewState* state) override {
-    HoverHighlightView::GetAccessibleState(state);
-    state->role = ui::AX_ROLE_CHECK_BOX;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    HoverHighlightView::GetAccessibleNodeData(node_data);
+    node_data->role = ui::AX_ROLE_CHECK_BOX;
     if (selected_)
-      state->AddStateFlag(ui::AX_STATE_CHECKED);
+      node_data->AddStateFlag(ui::AX_STATE_CHECKED);
   }
 
  private:
   bool selected_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectableHoverHighlightView);
 };
 
 class IMEDefaultView : public TrayItemMore {
  public:
@@ skipping 257 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash