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"
@@ skipping 156 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 201 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 66 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();
 }