| Index: chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| diff --git a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| index f94ac694a14cf9afa5bf66e21e902b40e7af22bd..daa5732a0305fb3d9c6fb2cba072f8b6e69d76ab 100644
|
| --- a/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| +++ b/chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.cc
|
| @@ -181,21 +181,17 @@ bool BrowserActionOverflowMenuController::GetDropFormats(
|
| views::MenuItemView* menu,
|
| int* formats,
|
| std::set<OSExchangeData::CustomFormat>* custom_formats) {
|
| - custom_formats->insert(BrowserActionDragData::GetBrowserActionCustomFormat());
|
| - return true;
|
| + return BrowserActionDragData::GetDropFormats(custom_formats);
|
| }
|
|
|
| bool BrowserActionOverflowMenuController::AreDropTypesRequired(
|
| views::MenuItemView* menu) {
|
| - return true;
|
| + return BrowserActionDragData::AreDropTypesRequired();
|
| }
|
|
|
| bool BrowserActionOverflowMenuController::CanDrop(
|
| views::MenuItemView* menu, const OSExchangeData& data) {
|
| - BrowserActionDragData drop_data;
|
| - if (!drop_data.Read(data))
|
| - return false;
|
| - return drop_data.IsFromProfile(owner_->profile());
|
| + return BrowserActionDragData::CanDrop(data, owner_->profile());
|
| }
|
|
|
| int BrowserActionOverflowMenuController::GetDropOperation(
|
|
|