Accessibility for Autofill Popup View in native code

chrome/browser/ui/views/autofill/autofill_popup_view_views.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/autofill/autofill_popup_view_views.h"
 
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/widget/widget.h"
 
 namespace autofill {
 
 AutofillPopupViewViews::AutofillPopupViewViews(
-    AutofillPopupController* controller,
-    views::Widget* parent_widget)
+    AutofillPopupController* controller, views::Widget* parent_widget)
     : AutofillPopupBaseView(controller, parent_widget),
-      controller_(controller) {}
+      controller_(controller) {
+  for (size_t i = 0; i < controller_->GetLineCount(); ++i) {
+    AutofillPopupChildView *child = new AutofillPopupChildView(controller, i);
+    AddChildViewAt(child, static_cast<int>(i));
+  }
+  SetFocusBehavior(FocusBehavior::ALWAYS);
+}
 
 AutofillPopupViewViews::~AutofillPopupViewViews() {}
 
 void AutofillPopupViewViews::Show() {
   DoShow();
+  NotifyAccessibilityEvent(ui::AX_EVENT_MENU_START, true);
 }
 
 void AutofillPopupViewViews::Hide() {
   // The controller is no longer valid after it hides us.
   controller_ = NULL;
-
   DoHide();
+  NotifyAccessibilityEvent(ui::AX_EVENT_MENU_END, true);
 }
 
 void AutofillPopupViewViews::UpdateBoundsAndRedrawPopup() {
   DoUpdateBoundsAndRedrawPopup();
 }
 
 void AutofillPopupViewViews::OnPaint(gfx::Canvas* canvas) {
   if (!controller_)
     return;
 
@@ skipping 13 matching lines @@
     } else {
       DrawAutofillEntry(canvas, i, line_rect);
     }
   }
 }
 
 void AutofillPopupViewViews::InvalidateRow(size_t row) {
   SchedulePaintInRect(controller_->layout_model().GetRowBounds(row));
 }
 
+void AutofillPopupViewViews::NotifyAccessibilityEventForRow(
+    ui::AXEvent event_type, size_t row) {
+  AutofillPopupChildView *child_view =
+      static_cast<AutofillPopupChildView*>(child_at(row));
+  child_view->NotifyAccessibilityEvent(event_type, true);
+}
+
 /**
 * Autofill entries in ltr.
 *
 * ............................................................................
 * . ICON | HTTP WARNING MESSAGE VALUE                                | LABEL .
 * ............................................................................
 * . OTHER AUTOFILL ENTRY VALUE |                                LABEL | ICON .
 * ............................................................................
 *
 * Autofill entries in rtl.
@@ skipping 99 matching lines @@
         controller_->GetElidedLabelAt(index),
         controller_->layout_model().GetLabelFontListForRow(index),
         GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_ResultsTableNormalDimmedText),
         gfx::Rect(label_x_align_left, entry_rect.y(), label_width,
                   entry_rect.height()),
         text_align);
   }
 }
 
+void AutofillPopupViewViews::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  node_data->role = ui::AX_ROLE_MENU_LIST_POPUP;

[David Tseng, 2017/02/25 02:03:16]

This isn't the right role to use for ChromeVox. Use AX_ROLE_MENU. 

[csashi, 2017/02/25 02:09:16]

Done.

+  node_data->SetName(l10n_util::GetStringUTF16(
+      IDS_AUTOFILL_POPUP_ACCESSIBLE_NODE_DATA));
+}
+
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   views::Widget* observing_widget =
       views::Widget::GetTopLevelWidgetForNativeView(
           controller->container_view());
 
   // If the top level widget can't be found, cancel the popup since we can't
   // fully set it up.
   if (!observing_widget)
     return NULL;
 
   return new AutofillPopupViewViews(controller, observing_widget);
 }
 
+AutofillPopupChildView::AutofillPopupChildView(
+    AutofillPopupController* controller, size_t index)
+    : controller_(controller), index_(index) {
+  SetFocusBehavior(FocusBehavior::ALWAYS);
+}
+
+AutofillPopupChildView::~AutofillPopupChildView() {}
+
+void AutofillPopupChildView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+  if (!controller_)
+    return;
+  // We do not special case |POPUP_ITEM_ID_SEPARATOR| suggestion because we
+  // skip that suggestion when the user navigates through the popup suggestions.
+  node_data->role = ui::AX_ROLE_MENU_ITEM;
+  node_data->SetName(controller_->GetElidedValueAt(index_));
+}
+
 }  // namespace autofill