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

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

Issue 347163002: Ensure DesktopDragDropClientAuraX11::StartEndMoveLoopTimer() is called before the move loop is ended (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 d3e52f787192b6ec1a11eebd26d7e8843e204637..d8a76e665593cb14d781487c88fc60d6a8d160d4 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
@@ -687,13 +687,16 @@ void DesktopDragDropClientAuraX11::OnMouseReleased() {
}
if (negotiated_operation_ != ui::DragDropTypes::DRAG_NONE) {
+ // Start timer to end the move loop if the target takes too long to send
+ // an XdndFinished message. It is important that StartEndMoveLoopTimer()
+ // is called before SendXdndDrop() because SendXdndDrop()
+ // sends XdndFinished synchronously if the drop target is a Chrome
+ // window.
+ StartEndMoveLoopTimer();
+
// We have negotiated an action with the other end.
source_state_ = SOURCE_STATE_DROPPED;
SendXdndDrop(source_current_window_);
-
- // Start timer to end the move loop if the target takes too long to send
- // an XdndFinished message.
- StartEndMoveLoopTimer();
return;
}
}
« 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