Replace ui::AXViewState with AXNodeData and AXActionData

ash/common/system/chromeos/tray_caps_lock.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/chromeos/tray_caps_lock.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/sys_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/widget/widget.h"
 
@@ skipping 78 matching lines @@
     // Align the shortcut text with the right end
     const int old_x = shortcut_label_->x();
     const int new_x =
         width() - shortcut_label_->width() - kTrayPopupPaddingHorizontal;
     shortcut_label_->SetX(new_x);
     const gfx::Size text_size = text_label_->size();
     text_label_->SetSize(
         gfx::Size(text_size.width() + new_x - old_x, text_size.height()));
   }
 
-  void GetAccessibleState(ui::AXViewState* state) override {
-    state->role = ui::AX_ROLE_BUTTON;
-    state->name = text_label_->text();
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override {
+    node_data->role = ui::AX_ROLE_BUTTON;
+    node_data->SetName(text_label_->text());
   }
 
   // Overridden from ActionableView:
   bool PerformAction(const ui::Event& event) override {
     chromeos::input_method::ImeKeyboard* keyboard =
         chromeos::input_method::InputMethodManager::Get()->GetImeKeyboard();
     if (keyboard) {
       WmShell::Get()->RecordUserMetricsAction(
           keyboard->CapsLockIsEnabled()
               ? UMA_STATUS_AREA_CAPS_LOCK_DISABLED_BY_CLICK
@@ skipping 99 matching lines @@
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash