Views a11y: Obey DialogDelegate::GetAccessibleWindowRole() rather than making a dialog-within-a-dia…

chrome/browser/ui/views/permission_bubble/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/permission_bubble/permission_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 40 matching lines @@
     : public views::BubbleDialogDelegateView {
  public:
   PermissionsBubbleDialogDelegateView(
       PermissionPromptImpl* owner,
       const std::vector<PermissionRequest*>& requests);
   ~PermissionsBubbleDialogDelegateView() override;
 
   void CloseBubble();
 
   // BubbleDialogDelegateView:
+  ui::AXRole GetAccessibleWindowRole() const override;
   bool ShouldShowCloseButton() const override;
   base::string16 GetWindowTitle() const override;
   void AddedToWidget() override;
   void OnWidgetDestroying(views::Widget* widget) 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;
   void SizeToContents() override;
 
   // Updates the anchor's arrow and view. Also repositions the bubble so it's
   // displayed in the correct location.
@@ skipping 64 matching lines @@
 PermissionsBubbleDialogDelegateView::~PermissionsBubbleDialogDelegateView() {
   if (owner_)
     owner_->Closing();
 }
 
 void PermissionsBubbleDialogDelegateView::CloseBubble() {
   owner_ = nullptr;
   GetWidget()->Close();
 }
 
+ui::AXRole PermissionsBubbleDialogDelegateView::GetAccessibleWindowRole()
+    const {
+  return ui::AX_ROLE_ALERT_DIALOG;
+}
+
 bool PermissionsBubbleDialogDelegateView::ShouldShowCloseButton() const {
   return true;
 }
 
 base::string16 PermissionsBubbleDialogDelegateView::GetWindowTitle() const {
   return l10n_util::GetStringFUTF16(IDS_PERMISSIONS_BUBBLE_PROMPT,
                                     display_origin_);
 }
 
 void PermissionsBubbleDialogDelegateView::AddedToWidget() {
@@ skipping 10 matching lines @@
 
 void PermissionsBubbleDialogDelegateView::OnWidgetDestroying(
     views::Widget* widget) {
   views::BubbleDialogDelegateView::OnWidgetDestroying(widget);
   if (owner_) {
     owner_->Closing();
     owner_ = nullptr;
   }
 }
 
-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 {
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
@@ skipping 149 matching lines @@
 
 void PermissionPromptImpl::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }