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

views/controls/menu/menu_controller.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_CONTROLLER_H_
 #define VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_
 
 #include "build/build_config.h"
 
 #include <list>
+#include <set>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
 #include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/menu_item_view.h"
 
 class OSExchangeData;
 
@@ skipping 51 matching lines @@
 
   // Various events, forwarded from the submenu.
   //
   // NOTE: the coordinates of the events are in that of the
   // MenuScrollViewContainer.
   void OnMousePressed(SubmenuView* source, const MouseEvent& event);
   void OnMouseDragged(SubmenuView* source, const MouseEvent& event);
   void OnMouseReleased(SubmenuView* source, const MouseEvent& event);
   void OnMouseMoved(SubmenuView* source, const MouseEvent& event);
   void OnMouseEntered(SubmenuView* source, const MouseEvent& event);
+  bool GetDropFormats(
+      SubmenuView* source,
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats);
+  bool AreDropTypesRequired(SubmenuView* source);
   bool CanDrop(SubmenuView* source, const OSExchangeData& data);
   void OnDragEntered(SubmenuView* source, const DropTargetEvent& event);
   int OnDragUpdated(SubmenuView* source, const DropTargetEvent& event);
   void OnDragExited(SubmenuView* source);
   int OnPerformDrop(SubmenuView* source, const DropTargetEvent& event);
 
   // Invoked from the scroll buttons of the MenuScrollViewContainer.
   void OnDragEnteredScrollButton(SubmenuView* source, bool is_up);
   void OnDragExitedScrollButton(SubmenuView* source);
 
@@ skipping 277 matching lines @@
   // Task for scrolling the menu. If non-null indicates a scroll is currently
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_CONTROLLER_H_