Enable better NVDA support for custom menus....

views/controls/menu/submenu_view.cc

 // Copyright (c) 2010 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 "views/controls/menu/submenu_view.h"
 
 #include "gfx/canvas.h"
+#include "views/accessibility/view_accessibility.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"
 
 // Height of the drop indicator. This should be an even number.
 static const int kDropIndicatorHeight = 2;
 
 // Color of the drop indicator.
@@ skipping 208 matching lines @@
     host_->ShowMenuHost(do_capture);
     return;
   }
 
   host_ = MenuHost::Create(this);
   // Force construction of the scroll view container.
   GetScrollViewContainer();
   // Make sure the first row is visible.
   ScrollRectToVisible(gfx::Rect(gfx::Point(), gfx::Size(1, 1)));
   host_->Init(parent, bounds, scroll_view_container_, do_capture);
+
+  GetScrollViewContainer()->NotifyAccessibilityEvent(
+        AccessibilityTypes::EVENT_MENUPOPUPSTART);
 }
 
 void SubmenuView::Reposition(const gfx::Rect& bounds) {
   if (host_)
     host_->SetMenuHostBounds(bounds);
 }
 
 void SubmenuView::Close() {
   if (host_) {
+    GetScrollViewContainer()->NotifyAccessibilityEvent(
+        AccessibilityTypes::EVENT_MENUPOPUPEND);
+
     host_->DestroyMenuHost();
     host_ = NULL;
   }
 }
 
 void SubmenuView::Hide() {
   if (host_)
     host_->HideMenuHost();
 }
 
@@ skipping 23 matching lines @@
   // selection if the drop is on the passed in item and the drop position is
   // ON.
   return (drop_item_ == item && drop_position_ == MenuDelegate::DROP_ON);
 }
 
 MenuScrollViewContainer* SubmenuView::GetScrollViewContainer() {
   if (!scroll_view_container_) {
     scroll_view_container_ = new MenuScrollViewContainer(this);
     // Otherwise MenuHost would delete us.
     scroll_view_container_->set_parent_owned(false);
+
+    // Use the parent menu item accessible name for the menu view.
+    std::wstring accessible_name;
+    GetMenuItem()->GetAccessibleName(&accessible_name);
+    scroll_view_container_->SetAccessibleName(accessible_name);
   }
   return scroll_view_container_;
 }
 
 gfx::NativeWindow SubmenuView::native_window() const {
   return host_ ? host_->GetMenuHostWindow() : NULL;
 }
 
 void SubmenuView::MenuHostDestroyed() {
   host_ = NULL;
@@ skipping 40 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views