Refactor: move data_exchange_delegate from display to seat

Bug: None
Change-Id: I30d46974760f98489d3a0fb88c4f2972f9731020
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2581359
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Aya Elsayed <ayaelattar@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Auto-Submit: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#835268}

components/exo/data_device.cc

@@ -39,13 +39,8 @@ ui::DragDropTypes::DragOperation DndActionToDragOperation(
 
 }  // namespace
 
-DataDevice::DataDevice(DataDeviceDelegate* delegate,
-                       Seat* seat,
-                       DataExchangeDelegate* data_exchange_delegate)
-    : delegate_(delegate),
-      seat_(seat),
-      data_exchange_delegate_(data_exchange_delegate),
-      drop_succeeded_(false) {
+DataDevice::DataDevice(DataDeviceDelegate* delegate, Seat* seat)
+    : delegate_(delegate), seat_(seat), drop_succeeded_(false) {
   WMHelper::GetInstance()->AddDragDropObserver(this);
   ui::ClipboardMonitor::GetInstance()->AddObserver(this);
 
@@ -67,7 +62,7 @@ void DataDevice::StartDrag(DataSource* source,
                            Surface* origin,
                            Surface* icon,
                            ui::mojom::DragEventSource event_source) {
-  seat_->StartDrag(data_exchange_delegate_, source, origin, icon, event_source);
+  seat_->StartDrag(source, origin, icon, event_source);
 }
 
 void DataDevice::SetSelection(DataSource* source) {
@@ -94,8 +89,8 @@ void DataDevice::OnDragEntered(const ui::DropTargetEvent& event) {
 
   data_offer_ =
       std::make_unique<ScopedDataOffer>(delegate_->OnDataOffer(), this);
-  data_offer_->get()->SetDropData(data_exchange_delegate_, surface->window(),
-                                  event.data());
+  data_offer_->get()->SetDropData(seat_->data_exchange_delegate(),
+                                  surface->window(), event.data());
   data_offer_->get()->SetSourceActions(dnd_actions);
   data_offer_->get()->SetActions(base::flat_set<DndAction>(), DndAction::kAsk);
   delegate_->OnEnter(surface, event.location_f(), *data_offer_->get());
@@ -204,7 +199,7 @@ Surface* DataDevice::GetEffectiveTargetForEvent(
 
 void DataDevice::SetSelectionToCurrentClipboardData() {
   DataOffer* data_offer = delegate_->OnDataOffer();
-  data_offer->SetClipboardData(data_exchange_delegate_,
+  data_offer->SetClipboardData(seat_->data_exchange_delegate(),
                                *ui::Clipboard::GetForCurrentThread());
   delegate_->OnSelection(*data_offer);
 }

components/exo/data_device.h

@@ -25,7 +25,6 @@ class DataDeviceDelegate;
 class DataOffer;
 class ScopedDataOffer;
 class DataSource;
-class DataExchangeDelegate;
 class Seat;
 class ScopedSurface;
 
@@ -38,9 +37,7 @@ class DataDevice : public WMHelper::DragDropObserver,
                    public SurfaceObserver,
                    public SeatObserver {
  public:
-  explicit DataDevice(DataDeviceDelegate* delegate,
-                      Seat* seat,
-                      DataExchangeDelegate* data_exchange_delegate);
+  DataDevice(DataDeviceDelegate* delegate, Seat* seat);
   ~DataDevice() override;
 
   // Starts drag-and-drop operation.
@@ -85,7 +82,6 @@ class DataDevice : public WMHelper::DragDropObserver,
 
   DataDeviceDelegate* const delegate_;
   Seat* const seat_;
-  DataExchangeDelegate* const data_exchange_delegate_;
   std::unique_ptr<ScopedDataOffer> data_offer_;
   std::unique_ptr<ScopedSurface> focused_surface_;
 

components/exo/data_device_unittest.cc

@@ -110,7 +110,7 @@ class TestDataDeviceDelegate : public DataDeviceDelegate {
 
 class TestSeat : public Seat {
  public:
-  TestSeat() {}
+  TestSeat() : Seat(std::make_unique<TestDataExchangeDelegate>()) {}
   void set_focused_surface(Surface* surface) { surface_ = surface; }
 
   // Overriden from Seat:
@@ -127,8 +127,7 @@ class DataDeviceTest : public test::ExoTestBase {
   void SetUp() override {
     test::ExoTestBase::SetUp();
     seat_ = std::make_unique<TestSeat>();
-    device_ = std::make_unique<DataDevice>(&delegate_, seat_.get(),
-                                           &data_exchange_delegate_);
+    device_ = std::make_unique<DataDevice>(&delegate_, seat_.get());
     data_.SetString(base::string16(base::ASCIIToUTF16("Test data")));
     surface_ = std::make_unique<Surface>();
   }
@@ -143,7 +142,6 @@ class DataDeviceTest : public test::ExoTestBase {
  protected:
   TestDataDeviceDelegate delegate_;
   std::unique_ptr<TestSeat> seat_;
-  TestDataExchangeDelegate data_exchange_delegate_;
   std::unique_ptr<DataDevice> device_;
   ui::OSExchangeData data_;
   std::unique_ptr<Surface> surface_;
@@ -299,8 +297,7 @@ TEST_F(DataDeviceTest, ClipboardDeviceCreatedAfterFocus) {
   std::vector<DataEvent> events;
   delegate_.PopEvents(&events);
 
-  device_ = std::make_unique<DataDevice>(&delegate_, seat_.get(),
-                                         &data_exchange_delegate_);
+  device_ = std::make_unique<DataDevice>(&delegate_, seat_.get());
 
   ASSERT_EQ(2u, delegate_.PopEvents(&events));
   EXPECT_EQ(DataEvent::kOffer, events[0]);

components/exo/display.cc

@@ -52,8 +52,9 @@ namespace exo {
 // Display, public:
 
 Display::Display()
+    : seat_(nullptr),
 #if defined(USE_OZONE)
-    : client_native_pixmap_factory_(
+      client_native_pixmap_factory_(
           gfx::CreateClientNativePixmapFactoryDmabuf())
 #endif
 {
@@ -68,7 +69,7 @@ Display::Display(
     : notification_surface_manager_(std::move(notification_surface_manager)),
       input_method_surface_manager_(std::move(input_method_surface_manager)),
       toast_surface_manager_(std::move(toast_surface_manager)),
-      data_exchange_delegate_(std::move(data_exchange_delegate)),
+      seat_(std::move(data_exchange_delegate)),
       client_native_pixmap_factory_(
           gfx::CreateClientNativePixmapFactoryDmabuf()) {}
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -282,8 +283,7 @@ std::unique_ptr<SubSurface> Display::CreateSubSurface(Surface* surface,
 
 std::unique_ptr<DataDevice> Display::CreateDataDevice(
     DataDeviceDelegate* delegate) {
-  return std::make_unique<DataDevice>(delegate, seat(),
-                                      data_exchange_delegate_.get());
+  return std::make_unique<DataDevice>(delegate, seat());
 }
 
 }  // namespace exo

components/exo/display.h

@@ -142,7 +142,6 @@ class Display {
   std::unique_ptr<ToastSurfaceManager> toast_surface_manager_;
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
-  std::unique_ptr<DataExchangeDelegate> data_exchange_delegate_;
   Seat seat_;
 
   bool shutdown_ = false;

components/exo/extended_drag_source_unittest.cc

@@ -113,7 +113,8 @@ class ExtendedDragSourceTest : public test::ExoTestBase {
     drag_drop_controller_->set_should_block_during_drag_drop(false);
     drag_drop_controller_->set_enabled(true);
 
-    seat_ = std::make_unique<Seat>();
+    seat_ =
+        std::make_unique<Seat>(std::make_unique<TestDataExchangeDelegate>());
     data_source_ = std::make_unique<DataSource>(new TestDataSourceDelegate);
     extended_drag_source_ = std::make_unique<ExtendedDragSource>(
         data_source_.get(), new TestExtendedDragSourceDelegate(
@@ -157,11 +158,10 @@ class ExtendedDragSourceTest : public test::ExoTestBase {
 
 TEST_F(ExtendedDragSourceTest, DestroySource) {
   Surface origin;
-  TestDataExchangeDelegate data_exchange_delegate;
 
   // Give |origin| a root window and start DragDropOperation.
   GetContext()->AddChild(origin.window());
-  seat_->StartDrag(&data_exchange_delegate, data_source_.get(), &origin,
+  seat_->StartDrag(data_source_.get(), &origin,
                    /*icon=*/nullptr, ui::mojom::DragEventSource::kMouse);
 
   // Ensure that destroying the data source invalidates its extended_drag_source

components/exo/pointer_unittest.cc

@@ -937,13 +937,12 @@ TEST_F(PointerTest, RegisterPointerEventsOnNonModal) {
 }
 
 TEST_F(PointerTest, DragDropAbort) {
-  Seat seat;
+  Seat seat(std::make_unique<TestDataExchangeDelegate>());
   MockPointerDelegate pointer_delegate;
   std::unique_ptr<Pointer> pointer(new Pointer(&pointer_delegate, &seat));
   TestDataSourceDelegate data_source_delegate;
   DataSource source(&data_source_delegate);
   Surface origin, icon;
-  TestDataExchangeDelegate data_exchange_delegate;
 
   // Make origin into a real window so the pointer can click it
   ShellSurface shell_surface(&origin);
@@ -959,8 +958,7 @@ TEST_F(PointerTest, DragDropAbort) {
   EXPECT_CALL(pointer_delegate, OnPointerEnter(&origin, gfx::PointF(), 0));
   generator.MoveMouseTo(origin.window()->GetBoundsInScreen().origin());
 
-  seat.StartDrag(&data_exchange_delegate, &source, &origin, &icon,
-                 ui::mojom::DragEventSource::kMouse);
+  seat.StartDrag(&source, &origin, &icon, ui::mojom::DragEventSource::kMouse);
   EXPECT_TRUE(seat.get_drag_drop_operation_for_testing());
 
   EXPECT_CALL(pointer_delegate, OnPointerButton).Times(2);

components/exo/seat.cc

@@ -19,6 +19,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/post_task.h"
 #include "build/chromeos_buildflags.h"
+#include "components/exo/data_exchange_delegate.h"
 #include "components/exo/data_source.h"
 #include "components/exo/drag_drop_operation.h"
 #include "components/exo/mime_utils.h"
@@ -53,7 +54,9 @@ Surface* GetEffectiveFocus(aura::Window* window) {
 
 }  // namespace
 
-Seat::Seat() : changing_clipboard_data_to_selection_source_(false) {
+Seat::Seat(std::unique_ptr<DataExchangeDelegate> delegate)
+    : changing_clipboard_data_to_selection_source_(false),
+      data_exchange_delegate_(std::move(delegate)) {
   WMHelper::GetInstance()->AddFocusObserver(this);
   // Prepend handler as it's critical that we see all events.
   WMHelper::GetInstance()->PrependPreTargetHandler(this);
@@ -75,6 +78,8 @@ Seat::Seat() : changing_clipboard_data_to_selection_source_(false) {
 #endif
 }
 
+Seat::Seat() : Seat(nullptr) {}
+
 Seat::~Seat() {
   Shutdown();
 }
@@ -106,15 +111,14 @@ Surface* Seat::GetFocusedSurface() {
   return GetEffectiveFocus(WMHelper::GetInstance()->GetFocusedWindow());
 }
 
-void Seat::StartDrag(DataExchangeDelegate* data_exchange_delegate,
-                     DataSource* source,
+void Seat::StartDrag(DataSource* source,
                      Surface* origin,
                      Surface* icon,
                      ui::mojom::DragEventSource event_source) {
   // DragDropOperation manages its own lifetime.
   drag_drop_operation_ =
-      DragDropOperation::Create(data_exchange_delegate, source, origin, icon,
-                                last_pointer_location_, event_source);
+      DragDropOperation::Create(data_exchange_delegate_.get(), source, origin,
+                                icon, last_pointer_location_, event_source);
 }
 
 void Seat::SetLastPointerLocation(const gfx::PointF& last_pointer_location) {

components/exo/seat.h

@@ -53,7 +53,10 @@ class Seat : public aura::client::FocusChangeObserver,
 #endif
              public DataSourceObserver {
  public:
+  explicit Seat(std::unique_ptr<DataExchangeDelegate> delegate);
   Seat();
+  Seat(const Seat&) = delete;
+  Seat& operator=(const Seat&) = delete;
   ~Seat() override;
 
   void Shutdown();
@@ -74,6 +77,10 @@ class Seat : public aura::client::FocusChangeObserver,
   const XkbTracker* xkb_tracker() const { return xkb_tracker_.get(); }
 #endif
 
+  DataExchangeDelegate* data_exchange_delegate() {
+    return data_exchange_delegate_.get();
+  }
+
   // Returns physical code for the currently processing event.
   ui::DomCode physical_code_for_currently_processing_event() const {
     return physical_code_for_currently_processing_event_;
@@ -82,8 +89,7 @@ class Seat : public aura::client::FocusChangeObserver,
   // Sets clipboard data from |source|.
   void SetSelection(DataSource* source);
 
-  void StartDrag(DataExchangeDelegate* data_exchange_delegate,
-                 DataSource* source,
+  void StartDrag(DataSource* source,
                  Surface* origin,
                  Surface* icon,
                  ui::mojom::DragEventSource event_source);
@@ -187,9 +193,8 @@ class Seat : public aura::client::FocusChangeObserver,
   std::unique_ptr<XkbTracker> xkb_tracker_;
 #endif  // BUILDFLAG(IS_CHROMEOS_ASH)
 
+  std::unique_ptr<DataExchangeDelegate> data_exchange_delegate_;
   base::WeakPtrFactory<Seat> weak_ptr_factory_{this};
-
-  DISALLOW_COPY_AND_ASSIGN(Seat);
 };
 
 }  // namespace exo

components/exo/seat_unittest.cc

@@ -422,8 +422,8 @@ TEST_F(SeatTest, SetSelection_SourceDestroyedAfterSetSelection) {
 
 TEST_F(SeatTest, SetSelection_NullSource) {
   Seat seat;
-
   TestDataSourceDelegate delegate;
+
   DataSource source(&delegate);
   source.Offer("text/plain;charset=utf-8");
   seat.SetSelection(&source);
@@ -485,17 +485,15 @@ TEST_F(SeatTest, PressedKeys) {
 }
 
 TEST_F(SeatTest, DragDropAbort) {
-  Seat seat;
+  Seat seat(std::make_unique<TestDataExchangeDelegate>());
   TestDataSourceDelegate delegate;
   DataSource source(&delegate);
   Surface origin, icon;
-  TestDataExchangeDelegate data_exchange_delegate;
 
   // Give origin a root window for DragDropOperation.
   GetContext()->AddChild(origin.window());
 
-  seat.StartDrag(&data_exchange_delegate, &source, &origin, &icon,
-                 ui::mojom::DragEventSource::kMouse);
+  seat.StartDrag(&source, &origin, &icon, ui::mojom::DragEventSource::kMouse);
   EXPECT_TRUE(seat.get_drag_drop_operation_for_testing());
   seat.AbortPendingDragOperation();
   EXPECT_FALSE(seat.get_drag_drop_operation_for_testing());

components/exo/touch_unittest.cc

@@ -501,13 +501,13 @@ TEST_F(TouchTest, OnTouchTilt) {
 }
 
 TEST_F(TouchTest, DragDropAbort) {
-  Seat seat;
+  Seat seat(std::make_unique<TestDataExchangeDelegate>());
+
   MockTouchDelegate touch_delegate;
   std::unique_ptr<Touch> touch(new Touch(&touch_delegate, &seat));
   TestDataSourceDelegate data_source_delegate;
   DataSource source(&data_source_delegate);
   Surface origin, icon;
-  TestDataExchangeDelegate data_exchange_delegate;
 
   // Make origin into a real window so the touch can click it
   ShellSurface shell_surface(&origin);
@@ -522,8 +522,7 @@ TEST_F(TouchTest, DragDropAbort) {
   EXPECT_CALL(touch_delegate, OnTouchFrame()).Times(2);
   generator.MoveTouch(origin.window()->GetBoundsInScreen().origin());
 
-  seat.StartDrag(&data_exchange_delegate, &source, &origin, &icon,
-                 ui::mojom::DragEventSource::kMouse);
+  seat.StartDrag(&source, &origin, &icon, ui::mojom::DragEventSource::kMouse);
   EXPECT_TRUE(seat.get_drag_drop_operation_for_testing());
 
   EXPECT_CALL(touch_delegate, OnTouchDown).Times(1);