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

Unified Diff: services/ui/ws/window_tree.cc

Issue 2739213003: aura-mus: wire up drag and drop. (Closed)
Patch Set: msvc doesn't understand that this is impossible. Created 3 years, 9 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
Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 9dedaed490cfffdc6373989f3f8e74a9bf42bf68..8602975133cad3c06da70455c4e44c282aa2d9d3 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1765,7 +1765,8 @@ void WindowTree::PerformDragDrop(
// We need to fail this move loop change, otherwise the client will just be
// waiting for |change_id|.
DVLOG(1) << "PerformDragDrop failed (access denied).";
- OnChangeCompleted(change_id, false);
+ client()->OnPerformDragDropCompleted(change_id, false,
+ mojom::kDropEffectNone);
return;
}
@@ -1773,7 +1774,8 @@ void WindowTree::PerformDragDrop(
if (!display_root) {
// The window isn't parented. There's nothing to do.
DVLOG(1) << "PerformDragDrop failed (window unparented).";
- OnChangeCompleted(change_id, false);
+ client()->OnPerformDragDropCompleted(change_id, false,
+ mojom::kDropEffectNone);
return;
}
@@ -1781,7 +1783,8 @@ void WindowTree::PerformDragDrop(
// Either the window manager is servicing a window drag or we're servicing
// a drag and drop operation. We can't start a second drag.
DVLOG(1) << "PerformDragDrop failed (already performing a drag).";
- OnChangeCompleted(change_id, false);
+ client()->OnPerformDragDropCompleted(change_id, false,
+ mojom::kDropEffectNone);
return;
}

Powered by Google App Engine
This is Rietveld 408576698