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(); |
} |