Index: trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc |
=================================================================== |
--- trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (revision 285300) |
+++ trunk/src/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc (working copy) |
@@ -181,17 +181,21 @@ |
views::MenuItemView* menu, |
int* formats, |
std::set<OSExchangeData::CustomFormat>* custom_formats) { |
- return BrowserActionDragData::GetDropFormats(custom_formats); |
+ custom_formats->insert(BrowserActionDragData::GetBrowserActionCustomFormat()); |
+ return true; |
} |
bool BrowserActionOverflowMenuController::AreDropTypesRequired( |
views::MenuItemView* menu) { |
- return BrowserActionDragData::AreDropTypesRequired(); |
+ return true; |
} |
bool BrowserActionOverflowMenuController::CanDrop( |
views::MenuItemView* menu, const OSExchangeData& data) { |
- return BrowserActionDragData::CanDrop(data, owner_->profile()); |
+ BrowserActionDragData drop_data; |
+ if (!drop_data.Read(data)) |
+ return false; |
+ return drop_data.IsFromProfile(owner_->profile()); |
} |
int BrowserActionOverflowMenuController::GetDropOperation( |