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

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

Issue 2603893002: Remove mojo::Map. (Closed)
Patch Set: rebase Created 3 years, 12 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_manager_state.h ('k') | services/ui/ws/window_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_manager_state.cc
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index fe6065db95b4675a126c1e64f05e03667c8628b7..c6851d67b674bac9b2dd436ec390c908a68a59bd 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -165,7 +165,7 @@ void WindowManagerState::SetDragDropSourceWindow(
DragSource* drag_source,
ServerWindow* window,
DragTargetConnection* source_connection,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
+ const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
uint32_t drag_operation) {
int32_t drag_pointer = PointerEvent::kMousePointerId;
if (event_awaiting_input_ack_ &&
@@ -178,9 +178,9 @@ void WindowManagerState::SetDragDropSourceWindow(
return;
}
- event_dispatcher_.SetDragDropSourceWindow(
- drag_source, window, source_connection, drag_pointer,
- std::move(drag_data), drag_operation);
+ event_dispatcher_.SetDragDropSourceWindow(drag_source, window,
+ source_connection, drag_pointer,
+ drag_data, drag_operation);
}
void WindowManagerState::CancelDragDrop() {
« no previous file with comments | « services/ui/ws/window_manager_state.h ('k') | services/ui/ws/window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698