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

ui/views/controls/menu/menu_controller.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 74 matching lines @@
                     MenuAnchorPosition position,
                     bool context_menu,
                     int* event_flags);
 
   // Whether or not Run blocks.
   bool IsBlockingRun() const { return blocking_run_; }
 
   // Whether or not drag operation is in progress.
   bool drag_in_progress() const { return drag_in_progress_; }
 
+  // Whether the MenuController initiated the drag in progress. False if there
+  // is no drag in progress.
+  bool did_initiate_drag() const { return did_initiate_drag_; }
+
   // Returns the owner of child windows.
   // WARNING: this may be NULL.
   Widget* owner() { return owner_; }
 
   // Get the anchor position wich is used to show this menu.
   MenuAnchorPosition GetAnchorPosition() { return state_.anchor; }
 
   // Cancels the current Run. See ExitType for a description of what happens
   // with the various parameters.
   void Cancel(ExitType type);
@@ skipping 30 matching lines @@
   bool CanDrop(SubmenuView* source, const ui::OSExchangeData& data);
   void OnDragEntered(SubmenuView* source, const ui::DropTargetEvent& event);
   int OnDragUpdated(SubmenuView* source, const ui::DropTargetEvent& event);
   void OnDragExited(SubmenuView* source);
   int OnPerformDrop(SubmenuView* source, const ui::DropTargetEvent& event);
 
   // Invoked from the scroll buttons of the MenuScrollViewContainer.
   void OnDragEnteredScrollButton(SubmenuView* source, bool is_up);
   void OnDragExitedScrollButton(SubmenuView* source);
 
+  // Called by the Widget when a drag is about to start on a child view. This
+  // could be initiated by one of our MenuItemViews, or could be through another
+  // child View.
+  void OnDragWillStart();
+
+  // Called by the Widget when the drag has completed. |should_close|
+  // corresponds to whether or not the menu should close.
+  void OnDragComplete(bool should_close);
+
   // Update the submenu's selection based on the current mouse location
   void UpdateSubmenuSelection(SubmenuView* source);
 
   // WidgetObserver overrides:
   virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
 
   // Only used for testing.
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
@@ skipping 394 matching lines @@
   // Owner of child windows.
   // WARNING: this may be NULL.
   Widget* owner_;
 
   // Indicates a possible drag operation.
   bool possible_drag_;
 
   // True when drag operation is in progress.
   bool drag_in_progress_;
 
+  // True when the drag operation in progress was initiated by the
+  // MenuController for a child MenuItemView (as opposed to initiated separately
+  // by a child View).
+  bool did_initiate_drag_;
+
   // Location the mouse was pressed at. Used to detect d&d.
   gfx::Point press_pt_;
 
   // We get a slew of drag updated messages as the mouse is over us. To avoid
   // continually processing whether we can drop, we cache the coordinates.
   bool valid_drop_coordinates_;
   gfx::Point drop_pt_;
   int last_drop_operation_;
 
   // If true, we're in the middle of invoking ShowAt on a submenu.
@@ skipping 35 matching lines @@
   bool item_selected_by_touch_;
 
   scoped_ptr<MenuMessageLoop> message_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_