views: menu: Unwind multiple menu message loops eagerly with EXIT_ALL

ui/views/controls/menu/menu_controller.cc

 // Copyright (c) 2012 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_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 416 matching lines @@
     if (nested_menu && result) {
       // We're nested and about to return a value. The caller might enter
       // another blocking loop. We need to make sure all menus are hidden
       // before that happens otherwise the menus will stay on screen.
       CloseAllNestedMenus();
       SetSelection(NULL, SELECTION_UPDATE_IMMEDIATELY | SELECTION_EXIT);
 
       // Set exit_all_, which makes sure all nested loops exit immediately.
       if (exit_type_ != EXIT_DESTROYED)
         SetExitType(EXIT_ALL);
+    } else if (exit_type_ == EXIT_ALL && message_loop_depth_) {

[spang, 2015/01/06 19:22:27]

Er, I think EXIT_DESTROYED also needs this treatment. Only EXIT_OUTERMOST is
different but we cannot reach here with that value since it is reset above..

Fixed.

+      // If we're closing all menus, also mark the next topmost menu
+      // message loop for termination, so that we'll unwind fully.
+      TerminateNestedMessageLoop();
     }
   }
 
   // Reset our pressed lock to the previous state's, if there was one.
   // The lock handles the case if the button was destroyed.
   pressed_lock_.reset(nested_pressed_lock.release());
 
   return result;
 }
 
@@ skipping 1855 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views