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_offer.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'chromium/components/exo/data_offer.cc') diff --git a/chromium/components/exo/data_offer.cc b/chromium/components/exo/data_offer.cc index eee7b8cbf2d..8ec119a950b 100644 --- a/chromium/components/exo/data_offer.cc +++ b/chromium/components/exo/data_offer.cc @@ -14,6 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" #include "base/task/thread_pool.h" +#include "components/exo/data_device.h" #include "components/exo/data_offer_delegate.h" #include "components/exo/data_offer_observer.h" #include "components/exo/file_helper.h" @@ -181,7 +182,10 @@ ScopedDataOffer::~ScopedDataOffer() { } DataOffer::DataOffer(DataOfferDelegate* delegate, Purpose purpose) - : delegate_(delegate), purpose_(purpose) {} + : delegate_(delegate), + dnd_action_(DndAction::kNone), + purpose_(purpose), + finished_(false) {} DataOffer::~DataOffer() { delegate_->OnDataOfferDestroying(this); @@ -226,7 +230,9 @@ void DataOffer::Receive(const std::string& mime_type, base::ScopedFD fd) { } } -void DataOffer::Finish() {} +void DataOffer::Finish() { + finished_ = true; +} void DataOffer::SetActions(const base::flat_set& dnd_actions, DndAction preferred_action) { -- cgit v1.2.1