Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/location_bar/bubble_icon_view.cc

 // Copyright 2013 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/location_bar/bubble_icon_view.h"
 
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/animation/ink_drop_highlight.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 
 BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
     : image_(new views::ImageView()),
       command_updater_(command_updater),
@@ skipping 20 matching lines @@
 }
 
 const gfx::ImageSkia& BubbleIconView::GetImage() const {
   return image_->GetImage();
 }
 
 void BubbleIconView::SetTooltipText(const base::string16& tooltip) {
   image_->SetTooltipText(tooltip);
 }
 
-void BubbleIconView::GetAccessibleState(ui::AXViewState* state) {
-  image_->GetAccessibleState(state);
-  state->role = ui::AX_ROLE_BUTTON;
+void BubbleIconView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  image_->GetAccessibleNodeData(node_data);
+  node_data->role = ui::AX_ROLE_BUTTON;
 }
 
 bool BubbleIconView::GetTooltipText(const gfx::Point& p,
                                     base::string16* tooltip) const {
   return !IsBubbleShowing() && image_->GetTooltipText(p, tooltip);
 }
 
 gfx::Size BubbleIconView::GetPreferredSize() const {
   return image_->GetPreferredSize();
 }
@@ skipping 131 matching lines @@
   image_->SetImage(gfx::CreateVectorIcon(
       GetVectorIcon(), LocationBarView::kIconWidth, icon_color));
 }
 
 void BubbleIconView::SetActiveInternal(bool active) {
   if (active_ == active)
     return;
   active_ = active;
   UpdateIcon();
 }