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

views/controls/menu/submenu_view.cc

 // 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.
 
 #include "views/controls/menu/submenu_view.h"
 
 #include "app/gfx/canvas.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"
@@ skipping 94 matching lines @@
   SchedulePaint();
 }
 
 void SubmenuView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
 
   if (drop_item_ && drop_position_ != MenuDelegate::DROP_ON)
     PaintDropIndicator(canvas, drop_item_, drop_position_);
 }
 
-// TODO(sky): need to add support for new dnd methods for Linux.
+bool SubmenuView::GetDropFormats(
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats) {
+  DCHECK(GetMenuItem()->GetMenuController());
+  return GetMenuItem()->GetMenuController()->GetDropFormats(this, formats,
+                                                            custom_formats);
+}
+
+bool SubmenuView::AreDropTypesRequired() {
+  DCHECK(GetMenuItem()->GetMenuController());
+  return GetMenuItem()->GetMenuController()->AreDropTypesRequired(this);
+}
 
 bool SubmenuView::CanDrop(const OSExchangeData& data) {
   DCHECK(GetMenuItem()->GetMenuController());
   return GetMenuItem()->GetMenuController()->CanDrop(this, data);
 }
 
 void SubmenuView::OnDragEntered(const DropTargetEvent& event) {
   DCHECK(GetMenuItem()->GetMenuController());
   GetMenuItem()->GetMenuController()->OnDragEntered(this, event);
 }
@@ skipping 188 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views