views: Terminate the nested message-loop correctly.

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"
 
 #if defined(OS_WIN)
 #include <windowsx.h>
 #endif
 
@@ skipping 2360 matching lines @@
   // MessagePumpDispatcher is only invoked before native events, which means
   // its entirely possible for a Widget::CloseNow() task to be processed before
   // the next native message. We quite the nested message loop as soon as
   // possible to avoid having deleted views classes (such as widgets and
   // rootviews) on the stack when the nested message loop stops.
   //
   // It's safe to invoke QuitNestedMessageLoop() multiple times, it only effects
   // 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 {
   aura::Window* root = GetOwnerRootWindow(owner_);
   return !aura::client::GetDragDropClient(root) ||
          !aura::client::GetDragDropClient(root)->IsDragDropInProgress();
 }
 
 void MenuController::HandleMouseLocation(SubmenuView* source,
                                          const gfx::Point& mouse_location) {
@@ skipping 27 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   aura::Window* root = GetOwnerRootWindow(owner_);
   return root ? gfx::Screen::GetScreenFor(root)
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views