From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/exo/data_device.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chromium/components/exo/data_device.h') diff --git a/chromium/components/exo/data_device.h b/chromium/components/exo/data_device.h index 9f110ef6dfb..8b0bb19b371 100644 --- a/chromium/components/exo/data_device.h +++ b/chromium/components/exo/data_device.h @@ -48,17 +48,15 @@ class DataDevice : public WMHelper::DragDropObserver, // be null if the data will be transferred only in the client. |origin| is // the surface which starts the drag and drop operation. |icon| is the // nullable image which is rendered at the next to cursor while drag - // operation. |serial| is the unique number comes from input events which - // triggers the drag and drop operation. + // operation. void StartDrag(DataSource* source, Surface* origin, Surface* icon, ui::DragDropTypes::DragEventSource event_source); // Sets selection data to the clipboard. - // |source| represents data comes from the client. |serial| is the unique - // number comes from input events which triggers the drag and drop operation. - void SetSelection(DataSource* source, uint32_t serial); + // |source| represents data comes from the client. + void SetSelection(DataSource* source); // Overridden from WMHelper::DragDropObserver: void OnDragEntered(const ui::DropTargetEvent& event) override; @@ -91,6 +89,9 @@ class DataDevice : public WMHelper::DragDropObserver, std::unique_ptr data_offer_; std::unique_ptr focused_surface_; + base::OnceClosure quit_closure_; + bool drop_succeeded_; + DISALLOW_COPY_AND_ASSIGN(DataDevice); }; -- cgit v1.2.1