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

ui/views/controls/menu/menu_controller.cc

Index: ui/views/controls/menu/menu_controller.cc
===================================================================
--- ui/views/controls/menu/menu_controller.cc	(revision 274103)
+++ ui/views/controls/menu/menu_controller.cc	(working copy)
@@ -2378,17 +2378,19 @@
   // the current loop.
   bool quit_now = ShouldQuitNow() && exit_type_ != EXIT_NONE &&
       message_loop_depth_;
+  if (quit_now)
+    TerminateNestedMessageLoop();
+}
 
-  if (quit_now) {
-    if (owner_) {
-      aura::Window* root = owner_->GetNativeWindow()->GetRootWindow();
-      aura::client::GetDispatcherClient(root)->QuitNestedMessageLoop();
-    } else {
-      base::MessageLoop::current()->QuitNow();
-    }
-    // Restore the previous dispatcher.
-    nested_dispatcher_.reset();
+void MenuController::TerminateNestedMessageLoop() {
+  if (owner_) {
+    aura::Window* root = owner_->GetNativeWindow()->GetRootWindow();
+    aura::client::GetDispatcherClient(root)->QuitNestedMessageLoop();
+  } else {
+    base::MessageLoop::current()->QuitNow();
   }
+  // Restore the previous dispatcher.
+  nested_dispatcher_.reset();
 }
 
 bool MenuController::ShouldQuitNow() const {