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

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 775 matching lines @@
   if (submenu->IsShowing()) {
     gfx::Point point = GetScreen()->GetCursorScreenPoint();
     const SubmenuView* root_submenu =
         submenu->GetMenuItem()->GetRootMenuItem()->GetSubmenu();
     View::ConvertPointFromScreen(
         root_submenu->GetWidget()->GetRootView(), &point);
     HandleMouseLocation(submenu, point);
   }
 }
 
+void MenuController::OnDragWillStart() {

[sky, 2014/07/14 15:19:05]

Position should match that of header.

[Devlin, 2014/07/16 16:00:45]

Whoops!  Done.

+  drag_in_progress_ = true;

[sky, 2014/07/14 15:19:05]

Before this add a DCHECK(!drag_in_progress_).

[Devlin, 2014/07/16 16:00:45]

Done.

+}
+
+void MenuController::OnDragComplete(bool should_close) {
+  drag_in_progress_ = false;

[sky, 2014/07/14 15:19:05]

And DCHECK(drag_in_progress_)

[Devlin, 2014/07/16 16:00:45]

Done.

+  if (GetActiveInstance() == this && showing_ && should_close) {

[sky, 2014/07/14 15:19:05]

move the showing_ and should_close checks first.

[Devlin, 2014/07/16 16:00:45]

Done.

+    CloseAllNestedMenus();
+    Cancel(EXIT_ALL);
+  }
+}
+
 void MenuController::OnWidgetDestroying(Widget* widget) {
   DCHECK_EQ(owner_, widget);
   owner_->RemoveObserver(this);
   owner_ = NULL;
   message_loop_->ClearOwner();
 }
 
 // static
 void MenuController::TurnOffMenuSelectionHoldForTest() {
   menu_selection_hold_time_ms = -1;
@@ skipping 157 matching lines @@
       source->GetWidget(), gfx::Size(item->width(), item->height())));
   item->PaintButton(canvas.get(), MenuItemView::PB_FOR_DRAG);
 
   OSExchangeData data;
   item->GetDelegate()->WriteDragData(item, &data);
   drag_utils::SetDragImageOnDataObject(*canvas,
                                        press_loc.OffsetFromOrigin(),
                                        &data);
   StopScrolling();
   int drag_ops = item->GetDelegate()->GetDragOperations(item);
-  drag_in_progress_ = true;
   // TODO(varunjain): Properly determine and send DRAG_EVENT_SOURCE below.
   item->GetWidget()->RunShellDrag(NULL, data, widget_loc, drag_ops,
       ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
-  drag_in_progress_ = false;
-
-  if (GetActiveInstance() == this) {
-    if (showing_) {
-      // We're still showing, close all menus.
-      CloseAllNestedMenus();
-      Cancel(EXIT_ALL);
-    }  // else case, drop was on us.
-  }  // else case, someone canceled us, don't do anything
 }
 
 bool MenuController::OnKeyDown(ui::KeyboardCode key_code) {
   DCHECK(blocking_run_);
 
   switch (key_code) {
     case ui::VKEY_UP:
       IncrementSelection(-1);
       break;
 
@@ skipping 1295 matching lines @@
   }
 }
 
 gfx::Screen* MenuController::GetScreen() {
   Widget* root = owner_ ? owner_->GetTopLevelWidget() : NULL;
   return root ? gfx::Screen::GetScreenFor(root->GetNativeView())
               : gfx::Screen::GetNativeScreen();
 }
 
 }  // namespace views