Enable better NVDA support for custom menus....

views/controls/menu/menu_controller.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/menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
@@ skipping 228 matching lines @@
     showing_ = true;
   }
 
   // Reset current state.
   pending_state_ = State();
   state_ = State();
   UpdateInitialLocation(bounds, position);
 
   owner_ = parent;
 
-  if (button)
-    button->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPSTART);
-
   // Set the selection, which opens the initial menu.
   SetSelection(root, true, true);
 
   if (!blocking_run_) {
     // Start the timer to hide the menu. This is needed as we get no
     // notification when the drag has finished.
     StartCancelAllTimer();
     return NULL;
   } else if (button) {
     menu_button_ = button;
@@ skipping 112 matching lines @@
   if (update_immediately)
     CommitPendingSelection();
   else
     StartShowTimer();
 
   // Notify an accessibility focus event on all menu items except for the root.
   if (menu_item &&
       (MenuDepth(menu_item) != 1 ||
           menu_item->GetType() != MenuItemView::SUBMENU))
     menu_item->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_FOCUS);
-
-  if (menu_button_ && !menu_item && exit_type_ != EXIT_DESTROYED) {
-    menu_button_->
-        NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPEND);
-  }
 }
 
 void MenuController::Cancel(ExitType type) {
   if (!showing_) {
     // This occurs if we're in the process of notifying the delegate for a drop
     // and the delegate cancels us.
     return;
   }
 
   MenuItemView* selected = state_.item;
@@ skipping 407 matching lines @@
     default:
       break;
   }
   TranslateMessage(&msg);
   DispatchMessage(&msg);
   return exit_type_ == EXIT_NONE;
 }
 
 #else
 bool MenuController::Dispatch(GdkEvent* event) {
-
   if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
     gtk_main_do_event(event);
     return false;
   }
 
   switch (event->type) {
     case GDK_KEY_PRESS: {
       base::KeyboardCode win_keycode =
           base::WindowsKeyCodeForGdkKeyCode(event->key.keyval);
 
@@ skipping 377 matching lines @@
   std::list<bool> pending_open_direction;
   state_.open_leading.swap(pending_open_direction);
   state_ = pending_state_;
   state_.open_leading.swap(pending_open_direction);
 
   int menu_depth = MenuDepth(state_.item);
   if (menu_depth == 0) {
     state_.open_leading.clear();
   } else {
     int cached_size = static_cast<int>(state_.open_leading.size());
-    DCHECK(menu_depth >= 0);
+    DCHECK_GE(menu_depth, 0);
     while (cached_size-- >= menu_depth)
       state_.open_leading.pop_back();
   }
 
   if (!state_.item) {
     // Nothing to select.
     StopScrolling();
     return;
   }
 
@@ skipping 546 matching lines @@
 
   MouseEvent release_event(Event::ET_MOUSE_RELEASED, -1, -1, 0);
   // Reset the active_mouse_view_ before sending mouse released. That way if if
   // calls back to use we aren't in a weird state.
   View* active_view = active_mouse_view_;
   active_mouse_view_ = NULL;
   active_view->OnMouseReleased(release_event, true);
 }
 
 }  // namespace views