Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/website_settings/permission_selector_row.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/website_settings/permission_selector_row.h"
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "chrome/grit/generated_resources.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 16 matching lines @@
   // of the |model| remains with the caller and is not transfered to the
   // |PermissionMenuButton|. If the |show_menu_marker| flag is true, then a
   // small icon is be displayed next to the button |text|, indicating that the
   // button opens a drop down menu.
   PermissionMenuButton(const base::string16& text,
                        PermissionMenuModel* model,
                        bool show_menu_marker);
   ~PermissionMenuButton() override;
 
   // Overridden from views::View.
-  void GetAccessibleState(ui::AXViewState* state) override;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
  private:
   // Overridden from views::MenuButtonListener.
   void OnMenuButtonClicked(views::MenuButton* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
   PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorRow|.
   std::unique_ptr<views::MenuRunner> menu_runner_;
@@ skipping 19 matching lines @@
 
   SetFocusForPlatform();
   set_request_focus_on_press(true);
   is_rtl_display_ =
       base::i18n::RIGHT_TO_LEFT == base::i18n::GetStringDirection(text);
 }
 
 PermissionMenuButton::~PermissionMenuButton() {
 }
 
-void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
-  MenuButton::GetAccessibleState(state);
-  state->value = GetText();
+void PermissionMenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  MenuButton::GetAccessibleNodeData(node_data);
+  node_data->SetValue(GetText());
 }
 
 void PermissionMenuButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   SetTextColor(views::Button::STATE_NORMAL, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
   SetTextColor(views::Button::STATE_HOVERED, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelEnabledColor));
   SetTextColor(views::Button::STATE_DISABLED, theme->GetSystemColor(
       ui::NativeTheme::kColorId_LabelDisabledColor));
 }
@@ skipping 258 matching lines @@
         permission.default_setting, content_settings::SETTING_SOURCE_USER));
     menu_button_->SizeToPreferredSize();
   } else if (combobox_) {
     bool use_default = permission.setting == CONTENT_SETTING_DEFAULT;
     combobox_->UpdateSelectedIndex(use_default);
   }
 
   for (PermissionSelectorRowObserver& observer : observer_list_)
     observer.OnPermissionChanged(permission);
 }