Replace ui::AXViewState with AXNodeData and AXActionData

ash/common/system/tray/tray_utils.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/tray/tray_utils.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
 #include "ash/common/wm_shell.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 
 namespace ash {
 
@@ skipping 73 matching lines @@
                         2);
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding,
         kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding));
   }
 }
 
 void GetAccessibleLabelFromDescendantViews(
     views::View* view,
     std::vector<base::string16>& out_labels) {
-  ui::AXViewState temp_state;
-  view->GetAccessibleState(&temp_state);
-  if (!temp_state.name.empty())
-    out_labels.push_back(temp_state.name);
+  ui::AXNodeData temp_node_data;
+  view->GetAccessibleNodeData(&temp_node_data);
+  if (!temp_node_data.GetStringAttribute(ui::AX_ATTR_NAME).empty())
+    out_labels.push_back(temp_node_data.GetString16Attribute(ui::AX_ATTR_NAME));
 
   // Do not descend into static text labels which may compute their own labels
   // recursively.
-  if (temp_state.role == ui::AX_ROLE_STATIC_TEXT)
+  if (temp_node_data.role == ui::AX_ROLE_STATIC_TEXT)
     return;
 
   for (int i = 0; i < view->child_count(); ++i)
     GetAccessibleLabelFromDescendantViews(view->child_at(i), out_labels);
 }
 
 bool CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 views::Separator* CreateVerticalSeparator() {
   views::Separator* separator =
       new views::Separator(views::Separator::HORIZONTAL);
   separator->SetPreferredSize(kHorizontalSeparatorHeight);
   separator->SetColor(kHorizontalSeparatorColor);
   return separator;
 }
 
 }  // namespace ash