Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/tabs/tab.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 "chrome/browser/ui/views/tabs/tab.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/grit/components_scaled_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/url_constants.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/animation_container.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_analysis.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/geometry/rect_conversions.h"
@@ skipping 1045 matching lines @@
     case ui::ET_GESTURE_SCROLL_UPDATE:
       controller_->ContinueDrag(this, *event);
       break;
 
     default:
       break;
   }
   event->SetHandled();
 }
 
-void Tab::GetAccessibleState(ui::AXViewState* state) {
-  state->role = ui::AX_ROLE_TAB;
-  state->name = data_.title;
-  state->AddStateFlag(ui::AX_STATE_MULTISELECTABLE);
-  state->AddStateFlag(ui::AX_STATE_SELECTABLE);
-  controller_->UpdateTabAccessibilityState(this, state);
+void Tab::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ui::AX_ROLE_TAB;
+  node_data->SetName(data_.title);
+  node_data->AddStateFlag(ui::AX_STATE_MULTISELECTABLE);
+  node_data->AddStateFlag(ui::AX_STATE_SELECTABLE);
+  controller_->UpdateTabAccessibilityState(this, node_data);
   if (IsSelected())
-    state->AddStateFlag(ui::AX_STATE_SELECTED);
+    node_data->AddStateFlag(ui::AX_STATE_SELECTED);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Tab, private
 
 void Tab::MaybeAdjustLeftForPinnedTab(gfx::Rect* bounds) const {
   if (ShouldRenderAsNormalTab())
     return;
   const int ideal_delta = width() - GetPinnedWidth();
   const int ideal_x = (GetPinnedWidth() - bounds->width()) / 2;
@@ skipping 458 matching lines @@
   SchedulePaintInRect(bounds);
 }
 
 gfx::Rect Tab::GetImmersiveBarRect() const {
   // The main bar is as wide as the normal tab's horizontal top line.
   gfx::Rect contents = GetContentsBounds();
   contents.set_y(0);
   contents.set_height(kImmersiveBarHeight);
   return contents;
 }