DLP: Remove View::OnPerformDrop

Removing OnPerformDrop as GetDropCallback is the one used now.

Change-Id: Iec5b242e25276303b0d339afa40bf5065302c505
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3549076
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Aya Elsayed <ayaelattar@chromium.org>
Cr-Commit-Position: refs/heads/main@{#985229}

ash/drag_drop/drag_drop_controller_unittest.cc

@@ -137,12 +137,6 @@ class DragTestView : public views::View {
 
   void OnDragExited() override { num_drag_exits_++; }
 
-  DragOperation OnPerformDrop(const ui::DropTargetEvent& event) override {
-    DragOperation output_drag_op = DragOperation::kNone;
-    PerformDrop(event, output_drag_op);
-    return output_drag_op;
-  }
-
   DropCallback GetDropCallback(const ui::DropTargetEvent& event) override {
     return base::BindOnce(&DragTestView::PerformDrop, base::Unretained(this));
   }
@@ -310,15 +304,6 @@ class EventTargetTestDelegate : public aura::client::DragDropDelegate {
                 State::kDragUpdateInvoked == state_);
     state_ = State::kDragExitInvoked;
   }
-  DragOperation OnPerformDrop(
-      const ui::DropTargetEvent& event,
-      std::unique_ptr<ui::OSExchangeData> data) override {
-    DragOperation output_drag_op = DragOperation::kNone;
-    PerformDrop(std::move(data), output_drag_op);
-
-    return output_drag_op;
-  }
-
   DropCallback GetDropCallback(const ui::DropTargetEvent& event) override {
     return base::BindOnce(&EventTargetTestDelegate::PerformDrop,
                           base::Unretained(this));

ash/drag_drop/drag_drop_unittest.cc

@@ -63,13 +63,6 @@ class TargetView : public views::View {
   int OnDragUpdated(const ui::DropTargetEvent& event) override {
     return ui::DragDropTypes::DRAG_MOVE;
   }
-  ui::mojom::DragOperation OnPerformDrop(
-      const ui::DropTargetEvent& event) override {
-    ui::mojom::DragOperation output_drag_op = ui::mojom::DragOperation::kNone;
-    PerformDrop(event, output_drag_op);
-    return output_drag_op;
-  }
-
   DropCallback GetDropCallback(const ui::DropTargetEvent& event) override {
     return base::BindOnce(&TargetView::PerformDrop, base::Unretained(this));
   }

chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc

@@ -420,13 +420,6 @@ class DropTargetView : public views::WidgetDelegateView {
     return ui::DragDropTypes::DRAG_COPY;
   }
 
-  ui::mojom::DragOperation OnPerformDrop(
-      const ui::DropTargetEvent& event) override {
-    ui::mojom::DragOperation output_drag_op = ui::mojom::DragOperation::kNone;
-    PerformDrop(event, output_drag_op);
-    return output_drag_op;
-  }
-
   DropCallback GetDropCallback(const ui::DropTargetEvent& event) override {
     return base::BindOnce(&DropTargetView::PerformDrop, base::Unretained(this));
   }

chrome/browser/ui/views/frame/tab_strip_region_view.cc

@@ -34,6 +34,7 @@
 #include "ui/views/layout/flex_layout.h"
 #include "ui/views/layout/flex_layout_types.h"
 #include "ui/views/style/typography.h"
+#include "ui/views/view.h"
 #include "ui/views/view_class_properties.h"
 
 namespace {
@@ -223,10 +224,10 @@ void TabStripRegionView::OnDragExited() {
   tab_strip_->OnDragExited();
 }
 
-ui::mojom::DragOperation TabStripRegionView::OnPerformDrop(
+views::View::DropCallback TabStripRegionView::GetDropCallback(
     const ui::DropTargetEvent& event) {
   DCHECK(tab_strip_->WantsToReceiveAllDragEvents());
-  return tab_strip_->OnPerformDrop(event);
+  return tab_strip_->GetDropCallback(event);
 }
 
 void TabStripRegionView::ChildPreferredSizeChanged(views::View* child) {

chrome/browser/ui/views/frame/tab_strip_region_view.h

@@ -60,8 +60,7 @@ class TabStripRegionView final : public views::AccessiblePaneView {
   void OnDragEntered(const ui::DropTargetEvent& event) override;
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
-  ui::mojom::DragOperation OnPerformDrop(
-      const ui::DropTargetEvent& event) override;
+  DropCallback GetDropCallback(const ui::DropTargetEvent& event) override;
 
   // views::AccessiblePaneView:
   void ChildPreferredSizeChanged(views::View* child) override;

chrome/browser/ui/views/menu_view_drag_and_drop_test.cc

@@ -83,7 +83,6 @@ class TestTargetView : public views::View {
   bool CanDrop(const OSExchangeData& data) override;
   void OnDragEntered(const ui::DropTargetEvent& event) override;
   int OnDragUpdated(const ui::DropTargetEvent& event) override;
-  DragOperation OnPerformDrop(const ui::DropTargetEvent& event) override;
   DropCallback GetDropCallback(const ui::DropTargetEvent& event) override;
   void OnDragExited() override;
 
@@ -136,13 +135,6 @@ int TestTargetView::OnDragUpdated(const ui::DropTargetEvent& event) {
   return ui::DragDropTypes::DRAG_MOVE;
 }
 
-DragOperation TestTargetView::OnPerformDrop(const ui::DropTargetEvent& event) {
-  auto drop_cb = GetDropCallback(event);
-  ui::mojom::DragOperation output_drag_op = ui::mojom::DragOperation::kNone;
-  std::move(drop_cb).Run(event, output_drag_op);
-  return output_drag_op;
-}
-
 views::View::DropCallback TestTargetView::GetDropCallback(
     const ui::DropTargetEvent& event) {
   dragging_ = false;

ui/views/cocoa/drag_drop_client_mac_unittest.mm

@@ -145,10 +145,6 @@ int OnDragUpdated(const ui::DropTargetEvent& event) override {
     return ui::DragDropTypes::DRAG_COPY;
   }
 
-  DragOperation OnPerformDrop(const ui::DropTargetEvent& event) override {
-    return DragOperation::kMove;
-  }
-
   views::View::DropCallback GetDropCallback(
       const ui::DropTargetEvent& event) override {
     return base::BindOnce([](const ui::DropTargetEvent& event,
@@ -323,12 +319,6 @@ void TearDown() override {
   DragDropCloseView(const DragDropCloseView&) = delete;
   DragDropCloseView& operator=(const DragDropCloseView&) = delete;
 
-  // View:
-  DragOperation OnPerformDrop(const ui::DropTargetEvent& event) override {
-    ui::mojom::DragOperation output_drag_op = ui::mojom::DragOperation::kNone;
-    PerformDrop(event, output_drag_op);
-    return output_drag_op;
-  }
   views::View::DropCallback GetDropCallback(
       const ui::DropTargetEvent& event) override {
     // base::Unretained is safe here because in the tests the view isn't deleted
@@ -345,7 +335,7 @@ void PerformDrop(const ui::DropTargetEvent& event,
   }
 };
 
-// Tests that closing Widget on OnPerformDrop does not crash.
+// Tests that closing Widget on drop does not crash.
 TEST_F(DragDropClientMacTest, CloseWidgetOnDrop) {
   OSExchangeData data;
   const std::u16string& text = u"text";
@@ -360,7 +350,7 @@ void PerformDrop(const ui::DropTargetEvent& event,
   EXPECT_EQ(DragUpdate(nil), NSDragOperationCopy);
   EXPECT_EQ(Drop(), NSDragOperationMove);
 
-  // OnPerformDrop() will have deleted the widget.
+  // Drop callback will have deleted the widget.
   widget_ = nullptr;
 }
 

ui/views/view.cc

@@ -1825,10 +1825,6 @@ int View::OnDragUpdated(const ui::DropTargetEvent& event) {
 
 void View::OnDragExited() {}
 
-ui::mojom::DragOperation View::OnPerformDrop(const ui::DropTargetEvent& event) {
-  return ui::mojom::DragOperation::kNone;
-}
-
 void View::OnDragDone() {}
 
 View::DropCallback View::GetDropCallback(const ui::DropTargetEvent& event) {

ui/views/view.h

@@ -1328,7 +1328,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // OnDragEntered is sent to the view when the mouse first enters the view,
   // as the mouse moves around within the view OnDragUpdated is invoked.
   // If the user releases the mouse over the view and OnDragUpdated returns a
-  // valid drop, then OnPerformDrop is invoked. If the mouse moves outside the
+  // valid drop, then GetDropCallback is invoked. If the mouse moves outside the
   // view or over another view that wants the drag, OnDragExited is invoked.
   //
   // Similar to mouse events, the deepest view under the mouse is first checked
@@ -1354,7 +1354,7 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // OnDragEntered is invoked when the mouse enters this view during a drag and
   // drop session and CanDrop returns true. This is immediately
   // followed by an invocation of OnDragUpdated, and eventually one of
-  // OnDragExited or OnPerformDrop.
+  // OnDragExited or GetDropCallback.
   virtual void OnDragEntered(const ui::DropTargetEvent& event);
 
   // Invoked during a drag and drop session while the mouse is over the view.
@@ -1367,13 +1367,6 @@ class VIEWS_EXPORT View : public ui::LayerDelegate,
   // when the drag session was canceled and the mouse was over the view.
   virtual void OnDragExited();
 
-  // Invoked during a drag and drop session when OnDragUpdated returns a valid
-  // operation and the user release the mouse.
-  // TODO(crbug.com/1175682): Remove OnPerformDrop and switch to GetDropCallback
-  // instead.
-  virtual ui::mojom::DragOperation OnPerformDrop(
-      const ui::DropTargetEvent& event);
-
   // Invoked from DoDrag after the drag completes. This implementation does
   // nothing, and is intended for subclasses to do cleanup.
   virtual void OnDragDone();