Allow menus to stay open during a child view's drag and drop

ui/views/controls/menu/menu_host.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_host.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/path.h"
@@ skipping 92 matching lines @@
 
 internal::RootView* MenuHost::CreateRootView() {
   return new MenuHostRootView(this, submenu_);
 }
 
 void MenuHost::OnMouseCaptureLost() {
   if (destroying_ || ignore_capture_lost_)
     return;
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
-  if (menu_controller && !menu_controller->drag_in_progress())
+  if (menu_controller &&
+      !menu_controller->drag_in_progress() &&
+      !child_drag_in_progress()) {
     menu_controller->CancelAll();
+  }
   Widget::OnMouseCaptureLost();
 }
 
 void MenuHost::OnNativeWidgetDestroyed() {
   if (!destroying_) {
     // We weren't explicitly told to destroy ourselves, which means the menu was
     // deleted out from under us (the window we're parented to was closed). Tell
     // the SubmenuView to drop references to us.
     submenu_->MenuHostDestroyed();
   }
   Widget::OnNativeWidgetDestroyed();
 }
 
 void MenuHost::OnOwnerClosing() {
   if (destroying_)
     return;
 
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
   if (menu_controller && !menu_controller->drag_in_progress())
     menu_controller->CancelAll();
 }
 
 }  // namespace views