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

views/controls/menu/menu_delegate.h

 // Copyright (c) 2006-2008 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 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;
 class MenuItemView;
 
 // MenuDelegate --------------------------------------------------------------
 
 // Delegate for a menu. This class is used as part of MenuItemView, see it
 // for details.
 // TODO(sky): merge this with Menu2Model.
@@ skipping 75 matching lines @@
   // a drop can occur on any of the child items of the item. For example,
   // consider the following menu structure:
   //
   // A
   //   B
   //   C
   //
   // 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
   // position.
   //
   // If a drop should not be allowed, returned DragDropTypes::DRAG_NONE.
   virtual int GetDropOperation(MenuItemView* item,
                                const DropTargetEvent& event,
                                DropPosition* position) {
     NOTREACHED() << "If you override CanDrop, you need to override this too";
@@ skipping 37 matching lines @@
   }
 
   // Notification that the user has highlighted the specified item.
   virtual void SelectionChanged(MenuItemView* menu) {
   }
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_