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

Unified Diff: services/ui/public/cpp/window_tree_client.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/public/cpp/window_tree_client.h ('k') | services/ui/public/interfaces/window_tree.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/window_tree_client.cc
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc
index 87fa4dc00c37b423e30046b6f7b2181269a9d81f..b9f524e367738ac79b76f071666eaab1b5f3a604 100644
--- a/services/ui/public/cpp/window_tree_client.cc
+++ b/services/ui/public/cpp/window_tree_client.cc
@@ -641,7 +641,6 @@ void WindowTreeClient::StopPointerWatcher() {
void WindowTreeClient::PerformDragDrop(
Window* window,
- int drag_pointer,
const std::map<std::string, std::vector<uint8_t>>& drag_data,
int drag_operation,
const gfx::Point& cursor_location,
@@ -665,7 +664,7 @@ void WindowTreeClient::PerformDragDrop(
current_drag_change, ui::mojom::kDropEffectNone, callback});
tree_->PerformDragDrop(
- current_drag_change, window->server_id(), drag_pointer,
+ current_drag_change, window->server_id(),
mojo::Map<mojo::String, mojo::Array<uint8_t>>::From(drag_data),
drag_operation);
}
« no previous file with comments | « services/ui/public/cpp/window_tree_client.h ('k') | services/ui/public/interfaces/window_tree.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698