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

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

Issue 2323553002: mash: Use the new mus drag and drop API to get drag working in mash. (Closed)
Patch Set: comments Created 4 years, 3 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 | « services/ui/ws/window_tree.h ('k') | ui/views/controls/menu/menu_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 9d030735e490e6a374e44fa33e33b30871929a61..d2b6b2b08980cda059d7dbec1c043c0cb1c463be 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1505,7 +1505,6 @@ void WindowTree::GetCursorLocationMemory(
void WindowTree::PerformDragDrop(
uint32_t change_id,
Id source_window_id,
- int32_t drag_pointer,
mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
uint32_t drag_operation) {
ServerWindow* window = GetWindowByClientId(ClientWindowId(source_window_id));
@@ -1542,8 +1541,8 @@ void WindowTree::PerformDragDrop(
// normal.
WindowManagerState* wms = display_root->window_manager_state();
window_server_->StartDragLoop(change_id, window, this);
- wms->SetDragDropSourceWindow(this, window, this, drag_pointer,
- std::move(drag_data), drag_operation);
+ wms->SetDragDropSourceWindow(this, window, this, std::move(drag_data),
+ drag_operation);
}
void WindowTree::CancelDragDrop(Id window_id) {
« no previous file with comments | « services/ui/ws/window_tree.h ('k') | ui/views/controls/menu/menu_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698