Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / ui / views / controls / menu / menu_controller.h

diff --git a/src/ui/views/controls/menu/menu_controller.h b/src/ui/views/controls/menu/menu_controller.h
index 30c56f0..dd1485d 100644 (file)
--- a/src/ui/views/controls/menu/menu_controller.h
+++ b/src/ui/views/controls/menu/menu_controller.h
@@ -84,14 +84,21 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
                     const gfx::Rect& bounds,
                     MenuAnchorPosition position,
                     bool context_menu,
+                    bool is_nested_drag,
                     int* event_flags);
 
   // Whether or not Run blocks.
   bool IsBlockingRun() const { return blocking_run_; }
 
+  bool in_nested_run() const { return !menu_stack_.empty(); }
+
   // 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_; }
@@ -142,6 +149,15 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   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);
 
@@ -149,6 +165,9 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
 
   // Only used for testing.
+  bool IsCancelAllTimerRunningForTest();
+
+  // Only used for testing.
   static void TurnOffMenuSelectionHoldForTest();
 
  private:
@@ -556,6 +575,11 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
   // 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_;