| Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| index df22b9b3287323a545827a4cc5ff7cdd3e768826..ceee5256cdf93a313436f81a7f4590ce4f2ba9cf 100644
|
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| @@ -373,18 +373,15 @@ void BrowserActionsContainer::Layout() {
|
| bool BrowserActionsContainer::GetDropFormats(
|
| int* formats,
|
| std::set<OSExchangeData::CustomFormat>* custom_formats) {
|
| - custom_formats->insert(BrowserActionDragData::GetBrowserActionCustomFormat());
|
| -
|
| - return true;
|
| + return BrowserActionDragData::GetDropFormats(formats, custom_formats);
|
| }
|
|
|
| bool BrowserActionsContainer::AreDropTypesRequired() {
|
| - return true;
|
| + return BrowserActionDragData::AreDropTypesRequired();
|
| }
|
|
|
| bool BrowserActionsContainer::CanDrop(const OSExchangeData& data) {
|
| - BrowserActionDragData drop_data;
|
| - return drop_data.Read(data) ? drop_data.IsFromProfile(profile_) : false;
|
| + return BrowserActionDragData::CanDrop(data, profile_);
|
| }
|
|
|
| void BrowserActionsContainer::OnDragEntered(
|
| @@ -499,6 +496,9 @@ int BrowserActionsContainer::OnPerformDrop(
|
| browser_action_views_[data.index()]->button()->extension(), i);
|
|
|
| OnDragExited(); // Perform clean up after dragging.
|
| + FOR_EACH_OBSERVER(BrowserActionsContainerObserver,
|
| + observers_,
|
| + OnBrowserActionDropped());
|
| return ui::DragDropTypes::DRAG_MOVE;
|
| }
|
|
|
|
|