Remove exo DataOffer::Purpose

Since COPY_PASTE and DRAG_DROP handling of callbacks has been unified,
there is no need to differentiate between them.

Bug: 1144138
Change-Id: I6e55f12ddc0ce625c7cc164b40049bd33b8c65f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514939
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824176}

components/exo/data_device.cc

@@ -91,8 +91,8 @@ void DataDevice::OnDragEntered(const ui::DropTargetEvent& event) {
     dnd_actions.insert(DndAction::kAsk);
   }
 
-  data_offer_ = std::make_unique<ScopedDataOffer>(
-      delegate_->OnDataOffer(DataOffer::DRAG_DROP), this);
+  data_offer_ =
+      std::make_unique<ScopedDataOffer>(delegate_->OnDataOffer(), this);
   data_offer_->get()->SetDropData(file_helper_, event.data());
   data_offer_->get()->SetSourceActions(dnd_actions);
   data_offer_->get()->SetActions(base::flat_set<DndAction>(), DndAction::kAsk);
@@ -201,7 +201,7 @@ Surface* DataDevice::GetEffectiveTargetForEvent(
 }
 
 void DataDevice::SetSelectionToCurrentClipboardData() {
-  DataOffer* data_offer = delegate_->OnDataOffer(DataOffer::COPY_PASTE);
+  DataOffer* data_offer = delegate_->OnDataOffer();
   data_offer->SetClipboardData(file_helper_,
                                *ui::Clipboard::GetForCurrentThread());
   delegate_->OnSelection(*data_offer);

components/exo/data_device_delegate.h

@@ -34,7 +34,7 @@ class DataDeviceDelegate {
 
   // Called when DataOffer object is delivered from a client. DataDeviceDelegate
   // has responsibility to release the returned DataOffer object.
-  virtual DataOffer* OnDataOffer(DataOffer::Purpose purpose) = 0;
+  virtual DataOffer* OnDataOffer() = 0;
 
   // Called during a drag operation when pointer enters |surface|.
   virtual void OnEnter(Surface* surface,

components/exo/data_device_unittest.cc

@@ -74,9 +74,9 @@ class TestDataDeviceDelegate : public DataDeviceDelegate {
   void OnDataDeviceDestroying(DataDevice* data_device) override {
     events_.push_back(DataEvent::kDestroy);
   }
-  DataOffer* OnDataOffer(DataOffer::Purpose purpose) override {
+  DataOffer* OnDataOffer() override {
     events_.push_back(DataEvent::kOffer);
-    data_offer_.reset(new DataOffer(new TestDataOfferDelegate, purpose));
+    data_offer_.reset(new DataOffer(new TestDataOfferDelegate));
     return data_offer_.get();
   }
   void OnEnter(Surface* surface,

components/exo/data_offer.cc

@@ -194,10 +194,8 @@ ScopedDataOffer::~ScopedDataOffer() {
   data_offer_->RemoveObserver(observer_);
 }
 
-DataOffer::DataOffer(DataOfferDelegate* delegate, Purpose purpose)
-    : delegate_(delegate),
-      dnd_action_(DndAction::kNone),
-      finished_(false) {}
+DataOffer::DataOffer(DataOfferDelegate* delegate)
+    : delegate_(delegate), dnd_action_(DndAction::kNone), finished_(false) {}
 
 DataOffer::~DataOffer() {
   delegate_->OnDataOfferDestroying(this);

components/exo/data_offer.h

@@ -42,12 +42,7 @@ class DataOffer final : public ui::PropertyHandler {
       base::OnceCallback<void(scoped_refptr<base::RefCountedMemory>)>;
   using AsyncSendDataCallback = base::OnceCallback<void(SendDataCallback)>;
 
-  enum Purpose {
-    COPY_PASTE,
-    DRAG_DROP,
-  };
-
-  DataOffer(DataOfferDelegate* delegate, Purpose purpose);
+  DataOffer(DataOfferDelegate* delegate);
   ~DataOffer() override;
 
   void AddObserver(DataOfferObserver* observer);

components/exo/data_offer_unittest.cc

@@ -138,7 +138,7 @@ TEST_F(DataOfferTest, SetTextDropData) {
   data.SetString(base::string16(base::ASCIIToUTF16("Test data")));
 
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   EXPECT_EQ(0u, delegate.mime_types().size());
   EXPECT_EQ(0u, delegate.source_actions().size());
@@ -168,7 +168,7 @@ TEST_F(DataOfferTest, SetHTMLDropData) {
   data.SetHtml(base::UTF8ToUTF16(html_data), GURL());
 
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   EXPECT_EQ(0u, delegate.mime_types().size());
   EXPECT_EQ(0u, delegate.source_actions().size());
@@ -202,7 +202,7 @@ TEST_F(DataOfferTest, SetHTMLDropData) {
 
 TEST_F(DataOfferTest, SetFileDropData) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -215,7 +215,7 @@ TEST_F(DataOfferTest, SetFileDropData) {
 
 TEST_F(DataOfferTest, SetPickleDropData) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -235,7 +235,7 @@ TEST_F(DataOfferTest, SetPickleDropData) {
 
 TEST_F(DataOfferTest, ReceiveString) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -270,7 +270,7 @@ TEST_F(DataOfferTest, ReceiveString) {
 
 TEST_F(DataOfferTest, ReceiveHTML) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -296,7 +296,7 @@ TEST_F(DataOfferTest, ReceiveHTML) {
 
 TEST_F(DataOfferTest, ReceiveUriList) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -315,7 +315,7 @@ TEST_F(DataOfferTest, ReceiveUriList) {
 
 TEST_F(DataOfferTest, ReceiveUriListFromPickle_ReceiveBeforeUrlIsResolved) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -363,7 +363,7 @@ TEST_F(DataOfferTest, ReceiveUriListFromPickle_ReceiveBeforeUrlIsResolved) {
 TEST_F(DataOfferTest,
        ReceiveUriListFromPickle_ReceiveBeforeEmptyUrlIsReturned) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::DRAG_DROP);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   ui::OSExchangeData data;
@@ -396,7 +396,7 @@ TEST_F(DataOfferTest,
 
 TEST_F(DataOfferTest, SetClipboardDataPlainText) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::COPY_PASTE);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   {
@@ -437,7 +437,7 @@ TEST_F(DataOfferTest, SetClipboardDataPlainText) {
 
 TEST_F(DataOfferTest, SetClipboardDataHTML) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::COPY_PASTE);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   {
@@ -469,7 +469,7 @@ TEST_F(DataOfferTest, SetClipboardDataHTML) {
 
 TEST_F(DataOfferTest, SetClipboardDataRTF) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::COPY_PASTE);
+  DataOffer data_offer(&delegate);
 
   TestFileHelper file_helper;
   {
@@ -494,7 +494,7 @@ TEST_F(DataOfferTest, SetClipboardDataRTF) {
 
 TEST_F(DataOfferTest, SetClipboardDataImage) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::COPY_PASTE);
+  DataOffer data_offer(&delegate);
 
   SkBitmap image;
   image.allocN32Pixels(10, 10);
@@ -544,7 +544,7 @@ TEST_F(DataOfferTest, SetClipboardDataImage) {
 
 TEST_F(DataOfferTest, AcceptWithNull) {
   TestDataOfferDelegate delegate;
-  DataOffer data_offer(&delegate, DataOffer::Purpose::COPY_PASTE);
+  DataOffer data_offer(&delegate);
   data_offer.Accept(nullptr);
 }
 

components/exo/display_unittest.cc

@@ -210,9 +210,7 @@ class TestDataDeviceDelegate : public DataDeviceDelegate {
  public:
   // Overriden from DataDeviceDelegate:
   void OnDataDeviceDestroying(DataDevice* data_device) override {}
-  DataOffer* OnDataOffer(DataOffer::Purpose purpose) override {
-    return nullptr;
-  }
+  DataOffer* OnDataOffer() override { return nullptr; }
   void OnEnter(Surface* surface,
                const gfx::PointF& location,
                const DataOffer& data_offer) override {}

components/exo/wayland/wl_data_device_manager.cc

@@ -252,12 +252,12 @@ class WaylandDataDeviceDelegate : public DataDeviceDelegate {
     return surface &&
            wl_resource_get_client(GetSurfaceResource(surface)) == client_;
   }
-  DataOffer* OnDataOffer(DataOffer::Purpose purpose) override {
+  DataOffer* OnDataOffer() override {
     wl_resource* data_offer_resource =
         wl_resource_create(client_, &wl_data_offer_interface,
                            wl_resource_get_version(data_device_resource_), 0);
     std::unique_ptr<DataOffer> data_offer = std::make_unique<DataOffer>(
-        new WaylandDataOfferDelegate(data_offer_resource), purpose);
+        new WaylandDataOfferDelegate(data_offer_resource));
     SetDataOfferResource(data_offer.get(), data_offer_resource);
     SetImplementation(data_offer_resource, &data_offer_implementation,
                       std::move(data_offer));