views: Terminate the nested message-loop correctly.

ui/views/controls/menu/menu_event_dispatcher_linux.cc

Index: ui/views/controls/menu/menu_event_dispatcher_linux.cc
diff --git a/ui/views/controls/menu/menu_event_dispatcher_linux.cc b/ui/views/controls/menu/menu_event_dispatcher_linux.cc
index 716c6bb51bb3f0bd167f87f8ab58b9d64ed4f3ff..6985cd9c1ac6b5505b71282aef3ea4589c3d78db 100644
--- a/ui/views/controls/menu/menu_event_dispatcher_linux.cc
+++ b/ui/views/controls/menu/menu_event_dispatcher_linux.cc
@@ -22,35 +22,49 @@ bool MenuEventDispatcher::CanDispatchEvent(const ui::PlatformEvent& event) {
 }
 
 uint32_t MenuEventDispatcher::DispatchEvent(const ui::PlatformEvent& event) {
+  bool should_quit = false;
+  bool should_perform_default = true;
   if (menu_controller_->exit_type() == MenuController::EXIT_ALL ||
-      menu_controller_->exit_type() == MenuController::EXIT_DESTROYED)
-    return (ui::POST_DISPATCH_QUIT_LOOP | ui::POST_DISPATCH_PERFORM_DEFAULT);
-
-  switch (ui::EventTypeFromNative(event)) {
-    case ui::ET_KEY_PRESSED: {
-      if (!menu_controller_->OnKeyDown(ui::KeyboardCodeFromNative(event)))
-        return ui::POST_DISPATCH_QUIT_LOOP;
-
-      // Do not check mnemonics if the Alt or Ctrl modifiers are pressed.
-      int flags = ui::EventFlagsFromNative(event);
-      if ((flags & (ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)) == 0) {
-        char c = ui::GetCharacterFromKeyCode(ui::KeyboardCodeFromNative(event),
-                                             flags);
-        if (menu_controller_->SelectByChar(c))
-          return ui::POST_DISPATCH_QUIT_LOOP;
+      menu_controller_->exit_type() == MenuController::EXIT_DESTROYED) {
+    should_quit = true;
+  } else {
+    switch (ui::EventTypeFromNative(event)) {
+      case ui::ET_KEY_PRESSED: {
+        if (!menu_controller_->OnKeyDown(ui::KeyboardCodeFromNative(event))) {
+          should_quit = true;
+          should_perform_default = false;
+          break;
+        }
+
+        // Do not check mnemonics if the Alt or Ctrl modifiers are pressed.
+        int flags = ui::EventFlagsFromNative(event);
+        if ((flags & (ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)) == 0) {
+          char c = ui::GetCharacterFromKeyCode(
+              ui::KeyboardCodeFromNative(event), flags);
+          if (menu_controller_->SelectByChar(c)) {
+            should_quit = true;
+            should_perform_default = false;
+            break;
+          }
+        }
+        should_quit = false;
+        should_perform_default = false;
+        break;
       }
-      return ui::POST_DISPATCH_NONE;
+      case ui::ET_KEY_RELEASED:
+        should_quit = false;
+        should_perform_default = false;
+        break;
+      default:
+        break;
     }
-    case ui::ET_KEY_RELEASED:
-      return ui::POST_DISPATCH_NONE;
-    default:
-      break;
   }
 
-  return ui::POST_DISPATCH_PERFORM_DEFAULT |
-         (menu_controller_->exit_type() == MenuController::EXIT_NONE
-              ? ui::POST_DISPATCH_NONE
-              : ui::POST_DISPATCH_QUIT_LOOP);
+  if (should_quit || menu_controller_->exit_type() != MenuController::EXIT_NONE)
+    menu_controller_->TerminateNestedMessageLoop();
+
+  return should_perform_default ? ui::POST_DISPATCH_PERFORM_DEFAULT
+                                : ui::POST_DISPATCH_NONE;
 }
 
 }  // namespace internal