Fixed accessibility issues in bookmark bubble dialog.

chrome/browser/ui/views/accessibility/accessibility_event_router_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/accessibility/accessibility_event_router_views.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
+#include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 using views::FocusManager;
 
 AccessibilityEventRouterViews::AccessibilityEventRouterViews()
     : most_recent_profile_(NULL) {
   // Register for notification when profile is destroyed to ensure that all
   // observers are detatched at that time.
@@ skipping 136 matching lines @@
 
   if (type == ui::AccessibilityTypes::EVENT_ALERT &&
       !(state.role == ui::AccessibilityTypes::ROLE_ALERT ||
         state.role == ui::AccessibilityTypes::ROLE_WINDOW)) {
     SendAlertControlNotification(view, type, profile);
     return;
   }
 
   switch (state.role) {
   case ui::AccessibilityTypes::ROLE_ALERT:
+  case ui::AccessibilityTypes::ROLE_DIALOG:
   case ui::AccessibilityTypes::ROLE_WINDOW:
     SendWindowNotification(view, type, profile);
     break;
   case ui::AccessibilityTypes::ROLE_BUTTONMENU:
   case ui::AccessibilityTypes::ROLE_MENUBAR:
   case ui::AccessibilityTypes::ROLE_MENUPOPUP:
     SendMenuNotification(view, type, profile);
     break;
   case ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN:
   case ui::AccessibilityTypes::ROLE_PUSHBUTTON:
@@ skipping 13 matching lines @@
     SendTextfieldNotification(view, type, profile);
     break;
   case ui::AccessibilityTypes::ROLE_MENUITEM:
     SendMenuItemNotification(view, type, profile);
     break;
   case ui::AccessibilityTypes::ROLE_RADIOBUTTON:
     // Not used anymore?
   case ui::AccessibilityTypes::ROLE_SLIDER:
     SendSliderNotification(view, type, profile);
     break;
+  case ui::AccessibilityTypes::ROLE_OUTLINE:
+    SendMenuNotification(view, type, profile);
+    break;
+  case ui::AccessibilityTypes::ROLE_OUTLINEITEM:
+    SendTreeItemNotification(view, type, profile);
+    break;
   default:
     // If this is encountered, please file a bug with the role that wasn't
     // caught so we can add accessibility extension API support.
     NOTREACHED();
   }
 }
 
 // static
 void AccessibilityEventRouterViews::SendButtonNotification(
     views::View* view,
@@ skipping 46 matching lines @@
     count = 0;
     RecursiveGetMenuItemIndexAndCount(parent_menu, view, &index, &count);
   }
 
   AccessibilityMenuItemInfo info(
       profile, name, context, has_submenu, index, count);
   SendControlAccessibilityNotification(event, &info);
 }
 
 // static
+void AccessibilityEventRouterViews::SendTreeItemNotification(
+    views::View* view,
+    ui::AccessibilityTypes::Event event,
+    Profile* profile) {
+  std::string name = GetViewName(view);
+  std::string context = GetViewContext(view);
+
+  if (strcmp(view->GetClassName(), views::TreeView::kViewClassName) != 0) {
+    NOTREACHED();
+    return;
+  }
+
+  views::TreeView* tree = static_cast<views::TreeView*>(view);

[dmazzoni, 2013/11/21 06:54:07]

Why is the view with a role of OUTLINEITEM the one with type TreeView? 

Is it possible to get this information directly from the accessibility info on
generic Views rather than by casting to a TreeView?

If you iterate over the children of the tree view, the selected item's view
should have STATE_SELECTED on it, and you can also use STATE_HASPOPUP to
indicate if it has a submenu.

[zel, 2013/11/22 02:34:01]

moved to another CL, will be addresses there

+  ui::TreeModelNode* selected_node = tree->GetSelectedNode();
+  ui::TreeModel* model = tree->model();
+
+  bool has_submenu = false;
+  int index = -1;
+  int count = -1;

[dmazzoni, 2013/11/21 06:54:07]

Can we set the count even if there isn't a selected node?

[zel, 2013/11/22 02:34:01]

moved to another CL, will be addresses there

+
+  if (selected_node) {
+    has_submenu = model->GetChildCount(selected_node);
+    ui::TreeModelNode* parent_node = model->GetParent(selected_node);
+    if (parent_node) {
+      index = model->GetIndexOf(parent_node, selected_node);
+      count = model->GetChildCount(parent_node);
+    }
+  }
+
+  AccessibilityMenuItemInfo info(
+      profile, name, context, has_submenu, index, count);
+  SendControlAccessibilityNotification(event, &info);
+}
+
+// static
 void AccessibilityEventRouterViews::SendTextfieldNotification(
     views::View* view,
     ui::AccessibilityTypes::Event event,
     Profile* profile) {
   ui::AccessibleViewState state;
   view->GetAccessibleState(&state);
   std::string name = UTF16ToUTF8(state.name);
   std::string context = GetViewContext(view);
   bool password =
       (state.state & ui::AccessibilityTypes::STATE_PROTECTED) != 0;
@@ skipping 102 matching lines @@
 std::string AccessibilityEventRouterViews::GetViewContext(views::View* view) {
   for (views::View* parent = view->parent();
        parent;
        parent = parent->parent()) {
     ui::AccessibleViewState state;
     parent->GetAccessibleState(&state);
 
     // Two cases are handled right now. More could be added in the future
     // depending on how the UI evolves.
 
-    // A control in a toolbar should use the toolbar's accessible name
-    // as the context.
-    if (state.role == ui::AccessibilityTypes::ROLE_TOOLBAR &&
+    // A control inside of alert, toolbar or dialog should use that container's
+    // accessible name.
+    if ((state.role == ui::AccessibilityTypes::ROLE_ALERT ||
+         state.role == ui::AccessibilityTypes::ROLE_DIALOG ||
+         state.role == ui::AccessibilityTypes::ROLE_TOOLBAR) &&
         !state.name.empty()) {
       return UTF16ToUTF8(state.name);
     }
 
     // A control inside of an alert or dialog (including an infobar)
     // should grab the first static text descendant as the context;
     // that's the prompt.
     if (state.role == ui::AccessibilityTypes::ROLE_ALERT ||
         state.role == ui::AccessibilityTypes::ROLE_DIALOG) {
       views::View* static_text_child = FindDescendantWithAccessibleRole(
@@ skipping 63 matching lines @@
     return UTF16ToUTF8(state.name);
 
   for (int i = 0; i < view->child_count(); ++i) {
     views::View* child = view->child_at(i);
     std::string result = RecursiveGetStaticText(child);
     if (!result.empty())
       return result;
   }
   return std::string();
 }