Adding drag-drop support in and out of the Browser Action overflow menu....

chrome/browser/views/extensions/browser_action_overflow_menu_controller.h

Index: chrome/browser/views/extensions/browser_action_overflow_menu_controller.h
===================================================================
--- chrome/browser/views/extensions/browser_action_overflow_menu_controller.h	(revision 37978)
+++ chrome/browser/views/extensions/browser_action_overflow_menu_controller.h	(working copy)
@@ -5,6 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 #define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
 
+#include <set>
 #include <vector>
 
 #include "views/controls/menu/menu_delegate.h"
@@ -13,17 +14,27 @@
 class BrowserActionView;
 class ExtensionActionContextMenu;
 
+// This class handles the overflow menu for browser actions (showing the menu,
+// drag and drop, etc). This class manages its own lifetime.
 class BrowserActionOverflowMenuController : public views::MenuDelegate {
  public:
+  // The observer is notified prior to the menu being deleted.
+  class Observer {
+   public:
+    virtual void NotifyMenuDeleted(
+        BrowserActionOverflowMenuController* controller) = 0;
+  };
+
   BrowserActionOverflowMenuController(
       BrowserActionsContainer* owner,
       views::MenuButton* menu_button,
       const std::vector<BrowserActionView*>& views,
       int start_index);
-  virtual ~BrowserActionOverflowMenuController();
 
+  void set_observer(Observer* observer) { observer_ = observer; }
+
   // Shows the overflow menu.
-  bool RunMenu(gfx::NativeWindow window);
+  bool RunMenu(gfx::NativeWindow window, bool for_drop);
 
   // Closes the overflow menu (and its context menu if open as well).
   void CancelMenu();
@@ -35,11 +46,43 @@
                                int x,
                                int y,
                                bool is_mouse_gesture);
+  virtual void DropMenuClosed(views::MenuItemView* menu);
+  // These drag functions offer support for dragging icons into the overflow
+  // menu.
+  virtual bool GetDropFormats(
+      views::MenuItemView* menu,
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats);
+  virtual bool AreDropTypesRequired(views::MenuItemView* menu);
+  virtual bool CanDrop(views::MenuItemView* menu, const OSExchangeData& data);
+  virtual int GetDropOperation(views::MenuItemView* item,
+                               const views::DropTargetEvent& event,
+                               DropPosition* position);
+  virtual int OnPerformDrop(views::MenuItemView* menu,
+                            DropPosition position,
+                            const views::DropTargetEvent& event);
+  // These three drag functions offer support for dragging icons out of the
+  // overflow menu.
+  virtual bool CanDrag(views::MenuItemView* menu);
+  virtual void WriteDragData(views::MenuItemView* sender, OSExchangeData* data);
+  virtual int GetDragOperations(views::MenuItemView* sender);
 
+
  private:
+  // This class manages its own lifetime.
+  virtual ~BrowserActionOverflowMenuController();
+
+  // Converts a menu item |id| into a BrowserActionView by adding the |id| value
+  // to the number of visible views (according to the container owner). If
+  // |index| is specified, it will point to the absolute index of the view.
+  BrowserActionView* ViewForId(int id, size_t* index);
+
   // A pointer to the browser action container that owns the overflow menu.
   BrowserActionsContainer* owner_;
 
+  // The observer, may be null.
+  Observer* observer_;
+
   // A pointer to the overflow menu button that we are showing the menu for.
   views::MenuButton* menu_button_;
 
@@ -57,6 +100,9 @@
   // picking browser actions to draw.
   int start_index_;
 
+  // Whether this controller is being used for drop.
+  bool for_drop_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserActionOverflowMenuController);
 };