diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/exo/wm_helper_chromeos.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/exo/wm_helper_chromeos.cc')
| -rw-r--r-- | chromium/components/exo/wm_helper_chromeos.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/components/exo/wm_helper_chromeos.cc b/chromium/components/exo/wm_helper_chromeos.cc index 93fb49a93b9..4086f953a96 100644 --- a/chromium/components/exo/wm_helper_chromeos.cc +++ b/chromium/components/exo/wm_helper_chromeos.cc @@ -120,11 +120,10 @@ void WMHelperChromeOS::OnDragExited() { int WMHelperChromeOS::OnPerformDrop(const ui::DropTargetEvent& event, std::unique_ptr<ui::OSExchangeData> data) { + int valid_operation = ui::DragDropTypes::DRAG_NONE; for (DragDropObserver& observer : drag_drop_observers_) - observer.OnPerformDrop(event); - // TODO(hirono): Return the correct result instead of always returning - // DRAG_MOVE. - return ui::DragDropTypes::DRAG_MOVE; + valid_operation = valid_operation | observer.OnPerformDrop(event); + return valid_operation; } void WMHelperChromeOS::AddVSyncParameterObserver( |