Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc

Issue 181013011: Fix Linux Aura drag-and-drop cancellation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert BookmarkBarView changes; remove NotifyDragLeave call. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
index e92b27000c048362eaae4ab77b53507b3c425ae9..2ccbddee68cdf9e2d99c225d0abf7f9f26f746bd 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.cc
@@ -682,6 +682,8 @@ void DesktopDragDropClientAuraX11::OnMouseReleased() {
}
void DesktopDragDropClientAuraX11::OnMoveLoopEnded() {
+ if (source_current_window_ != None)
+ SendXdndLeave(source_current_window_);
target_current_context_.reset();
}
@@ -691,8 +693,7 @@ void DesktopDragDropClientAuraX11::DragTranslate(
scoped_ptr<ui::DropTargetEvent>* event,
aura::client::DragDropDelegate** delegate) {
gfx::Point root_location = root_window_location;
- root_window_->GetHost()->ConvertPointFromNativeScreen(
- &root_location);
+ root_window_->GetHost()->ConvertPointFromNativeScreen(&root_location);
aura::Window* target_window =
root_window_->GetEventHandlerForPoint(root_location);
bool target_window_changed = false;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698