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

chrome/browser/views/bookmark_menu_controller_views.cc

 // Copyright (c) 2009 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 "chrome/browser/views/bookmark_menu_controller_views.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
@@ skipping 55 matching lines @@
 
 void BookmarkMenuController::ExecuteCommand(int id, int mouse_event_flags) {
   DCHECK(page_navigator_);
   DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end());
   GURL url = menu_id_to_node_map_[id]->GetURL();
   page_navigator_->OpenURL(
       url, GURL(), event_utils::DispositionFromEventFlags(mouse_event_flags),
       PageTransition::AUTO_BOOKMARK);
 }
 
+bool BookmarkMenuController::GetDropFormats(
+      views::MenuItemView* menu,
+      int* formats,
+      std::set<OSExchangeData::CustomFormat>* custom_formats) {
+  *formats = OSExchangeData::URL;
+  custom_formats->insert(BookmarkDragData::GetBookmarkCustomFormat());
+  return true;
+}
+
+bool BookmarkMenuController::AreDropTypesRequired(views::MenuItemView* menu) {
+  return true;
+}
+
 bool BookmarkMenuController::CanDrop(views::MenuItemView* menu,
                                      const OSExchangeData& data) {
   // Only accept drops of 1 node, which is the case for all data dragged from
   // bookmark bar and menus.
 
   if (!drop_data_.Read(data) || drop_data_.elements.size() != 1)
     return false;
 
   if (drop_data_.has_single_url())
     return true;
@@ skipping 161 matching lines @@
     }
     menu_id_to_node_map_[id] = node;
   }
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuDeleted(this);
 }