Wires up drag and drop for bookmark menus and cleans up a couple of...

views/controls/menu/menu_delegate.h

Index: views/controls/menu/menu_delegate.h
===================================================================
--- views/controls/menu/menu_delegate.h	(revision 25647)
+++ views/controls/menu/menu_delegate.h	(working copy)
@@ -5,15 +5,15 @@
 #ifndef VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 
+#include <set>
 #include <string>
 
 #include "app/drag_drop_types.h"
+#include "app/os_exchange_data.h"
 #include "base/logging.h"
 #include "views/controls/menu/controller.h"
 #include "views/event.h"
 
-class OSExchangeData;
-
 namespace views {
 
 class DropTargetEvent;
@@ -109,11 +109,25 @@
   // Where A has a submenu with children B and C. This is ONLY invoked for
   // A, not B and C.
   //
+

[jcampan, 2009/09/08 20:27:36]

Nit: remove empty line

   // To restrict which children can be dropped on override GetDropOperation.
   virtual bool CanDrop(MenuItemView* menu, const OSExchangeData& data) {
     return false;
   }
 
+  // See view for a description of this method.
+  virtual bool GetDropFormats(
+      MenuItemView* menu,
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats) {
+    return false;
+  }
+
+  // See view for a description of this method.
+  virtual bool AreDropTypesRequired(MenuItemView* menu) {
+    return false;
+  }
+
   // Returns the drop operation for the specified target menu item. This is
   // only invoked if CanDrop returned true for the parent menu. position
   // is set based on the location of the mouse, reset to specify a different