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 423 matching lines @@
       // Set exit_all_, which makes sure all nested loops exit immediately.
       if (exit_type_ != EXIT_DESTROYED)
         SetExitType(EXIT_ALL);
     }
   }
 
   // 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());
 
+  // If we're closing all menus, also mark the next topmost menu
+  // message loop for termination, so that we'll unwind fully.
+  if (exit_type_ == EXIT_ALL && message_loop_depth_)
+    TerminateNestedMessageLoop();

[sky, 2015/01/06 01:00:15]

Move this up to around 437'ish. An else case for the if on 427.

[spang, 2015/01/06 19:14:12]

Done.

+
   return result;
 }
 
 void MenuController::Cancel(ExitType type) {
   // If the menu has already been destroyed, no further cancellation is
   // needed.  We especially don't want to set the |exit_type_| to a lesser
   // value.
   if (exit_type_ == EXIT_DESTROYED || exit_type_ == type)
     return;
 
@@ skipping 1848 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views