Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: views/controls/menu/menu_controller.cc

Issue 3015055: Enable better NVDA support for custom menus.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/accessibility/view_accessibility.cc ('k') | views/controls/menu/menu_scroll_view_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_controller.cc
===================================================================
--- views/controls/menu/menu_controller.cc (revision 54772)
+++ views/controls/menu/menu_controller.cc (working copy)
@@ -246,9 +246,6 @@
owner_ = parent;
- if (button)
- button->NotifyAccessibilityEvent(AccessibilityTypes::EVENT_MENUPOPUPSTART);
-
// Set the selection, which opens the initial menu.
SetSelection(root, true, true);
@@ -381,11 +378,6 @@
(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) {
@@ -813,7 +805,6 @@
#else
bool MenuController::Dispatch(GdkEvent* event) {
-
if (exit_type_ == EXIT_ALL || exit_type_ == EXIT_DESTROYED) {
gtk_main_do_event(event);
return false;
@@ -1211,7 +1202,7 @@
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();
}
« no previous file with comments | « views/accessibility/view_accessibility.cc ('k') | views/controls/menu/menu_scroll_view_container.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698