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

chrome/browser/ui/views/conflicting_module_view_win.cc

 // Copyright (c) 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/conflicting_module_view_win.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 94 matching lines @@
 void ConflictingModuleView::ShowBubble() {
   GetWidget()->Show();
 
   IntegerPrefMember bubble_shown;
   bubble_shown.Init(
       prefs::kModuleConflictBubbleShown,
       browser_->profile()->GetPrefs());
   bubble_shown.SetValue(bubble_shown.GetValue() + 1);
 }
 
+ui::AXRole ConflictingModuleView::GetAccessibleWindowRole() const {
+  return ui::AX_ROLE_ALERT_DIALOG;
+}
+
 void ConflictingModuleView::OnWidgetClosing(views::Widget* widget) {
   views::BubbleDialogDelegateView::OnWidgetClosing(widget);
   base::RecordAction(
       UserMetricsAction("ConflictingModuleNotificationDismissed"));
 }
 
 bool ConflictingModuleView::Accept() {
   browser_->OpenURL(
       content::OpenURLParams(help_center_url_, content::Referrer(),
                              WindowOpenDisposition::NEW_FOREGROUND_TAB,
@@ skipping 30 matching lines @@
       IDS_CONFLICTING_MODULE_BUBBLE_WIDTH_CHARS));
   AddChildView(explanation);
 
   base::RecordAction(UserMetricsAction("ConflictingModuleNotificationShown"));
 
   UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection",
       EnumerateModulesModel::ACTION_BUBBLE_SHOWN,
       EnumerateModulesModel::ACTION_BOUNDARY);
 }
 
-void ConflictingModuleView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
-  node_data->role = ui::AX_ROLE_ALERT_DIALOG;
-}
-
 void ConflictingModuleView::OnConflictsAcknowledged() {
   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance();
   if (!model->ShouldShowConflictWarning())
     GetWidget()->Close();
 }