Replace ui::AXViewState with AXNodeData and AXActionData

chrome/browser/ui/views/website_settings/permission_prompt_impl.cc

 // Copyright 2014 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_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_row.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_row_observer.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/url_formatter/elide_url.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/combobox_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/checkbox.h"
@@ skipping 32 matching lines @@
 
   PermissionCombobox(Profile* profile,
                      Listener* listener,
                      int index,
                      const GURL& url,
                      ContentSetting setting);
   ~PermissionCombobox() override;
 
   int index() const { return index_; }
 
-  void GetAccessibleState(ui::AXViewState* state) override;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
 
   // MenuButtonListener:
   void OnMenuButtonClicked(views::MenuButton* source,
                            const gfx::Point& point,
                            const ui::Event* event) override;
 
   // Callback when a permission's setting is changed.
   void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission);
 
  private:
@@ skipping 16 matching lines @@
           url,
           setting,
           base::Bind(&PermissionCombobox::PermissionChanged,
                      base::Unretained(this)))) {
   SetText(model_->GetLabelAt(model_->GetIndexOfCommandId(setting)));
   SizeToPreferredSize();
 }
 
 PermissionCombobox::~PermissionCombobox() {}
 
-void PermissionCombobox::GetAccessibleState(ui::AXViewState* state) {
-  MenuButton::GetAccessibleState(state);
-  state->value = GetText();
+void PermissionCombobox::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  MenuButton::GetAccessibleNodeData(node_data);
+  node_data->SetValue(GetText());
 }
 
 void PermissionCombobox::OnMenuButtonClicked(views::MenuButton* source,
                                              const gfx::Point& point,
                                              const ui::Event* event) {
   menu_runner_.reset(new views::MenuRunner(
       model_.get(),
       views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::ASYNC));
 
   gfx::Point p(point);
@@ skipping 26 matching lines @@
 
   void CloseBubble();
   void SizeToContents();
 
   // BubbleDialogDelegateView:
   bool ShouldShowCloseButton() const override;
   const gfx::FontList& GetTitleFontList() const override;
   base::string16 GetWindowTitle() const override;
   void OnWidgetDestroying(views::Widget* widget) override;
   gfx::Size GetPreferredSize() const override;
-  void GetAccessibleState(ui::AXViewState* state) override;
+  void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
   bool Cancel() override;
   bool Accept() override;
   bool Close() override;
   int GetDefaultDialogButton() const override;
   int GetDialogButtons() const override;
   base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
 
   // PermissionCombobox::Listener:
   void PermissionSelectionChanged(int index, bool allowed) override;
 
@@ skipping 128 matching lines @@
     owner_ = nullptr;
   }
 }
 
 gfx::Size PermissionsBubbleDialogDelegateView::GetPreferredSize() const {
   // TODO(estade): bubbles should default to this width.
   const int kWidth = 320 - GetInsets().width();
   return gfx::Size(kWidth, GetHeightForWidth(kWidth));
 }
 
-void PermissionsBubbleDialogDelegateView::GetAccessibleState(
-    ui::AXViewState* state) {
-  views::BubbleDialogDelegateView::GetAccessibleState(state);
-  state->role = ui::AX_ROLE_ALERT_DIALOG;
+void PermissionsBubbleDialogDelegateView::GetAccessibleNodeData(
+    ui::AXNodeData* node_data) {
+  views::BubbleDialogDelegateView::GetAccessibleNodeData(node_data);
+  node_data->role = ui::AX_ROLE_ALERT_DIALOG;
 }
 
 int PermissionsBubbleDialogDelegateView::GetDefaultDialogButton() const {
   // To prevent permissions being accepted accidentally, and as a security
   // measure against crbug.com/619429, permission prompts should not be accepted
   // as the default action.
   return ui::DIALOG_BUTTON_NONE;
 }
 
 int PermissionsBubbleDialogDelegateView::GetDialogButtons() const {
@@ skipping 154 matching lines @@
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 Profile* PermissionPromptImpl::GetProfile() {
   return browser_->profile();
 }