Merge 269819 "views: Terminate the nested message-loop correctly..."

ui/views/controls/menu/menu_event_dispatcher_linux.cc

 // Copyright 2014 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 "ui/views/controls/menu/menu_event_dispatcher_linux.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 namespace internal {
 
 MenuEventDispatcher::MenuEventDispatcher(MenuController* controller)
     : menu_controller_(controller) {}
 
 MenuEventDispatcher::~MenuEventDispatcher() {}
 
 bool MenuEventDispatcher::CanDispatchEvent(const ui::PlatformEvent& event) {
   return true;
 }
 
 uint32_t MenuEventDispatcher::DispatchEvent(const ui::PlatformEvent& event) {
+  bool should_quit = false;
+  bool should_perform_default = true;
   bool should_process_event = true;
 
   // Check if the event should be handled.
   scoped_ptr<ui::Event> ui_event(ui::EventFromNative(event));
   if (ui_event && menu_controller_->owner()) {
     aura::Window* menu_window = menu_controller_->owner()->GetNativeWindow();
     aura::Window* target_window = static_cast<aura::Window*>(
         static_cast<ui::EventTarget*>(menu_window->GetRootWindow())->
             GetEventTargeter()->FindTargetForEvent(menu_window,
                                                    ui_event.get()));
     // TODO(flackr): The event shouldn't be handled if target_window is not
     // menu_window, however the event targeter does not properly target the
     // open menu. For now, we allow targeters to prevent handling by the menu.
     if (!target_window)
       should_process_event = false;
   }
 
   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);
-
-  if (should_process_event) {
+      menu_controller_->exit_type() == MenuController::EXIT_DESTROYED) {
+    should_quit = true;
+  } else if (should_process_event) {
     switch (ui::EventTypeFromNative(event)) {
       case ui::ET_KEY_PRESSED: {
-        if (!menu_controller_->OnKeyDown(ui::KeyboardCodeFromNative(event)))
-          return ui::POST_DISPATCH_QUIT_LOOP;
+        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))
-            return ui::POST_DISPATCH_QUIT_LOOP;
+          if (menu_controller_->SelectByChar(c)) {
+            should_quit = true;
+            should_perform_default = false;
+            break;
+          }
         }
-        return ui::POST_DISPATCH_NONE;
+        should_quit = false;
+        should_perform_default = false;
+        break;
       }
       case ui::ET_KEY_RELEASED:
-        return ui::POST_DISPATCH_NONE;
+        should_quit = false;
+        should_perform_default = false;
+        break;
       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
 }  // namespace views