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

Unified Diff: services/ui/ws/drag_controller.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/drag_controller.h ('k') | services/ui/ws/drag_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/drag_controller.cc
diff --git a/services/ui/ws/drag_controller.cc b/services/ui/ws/drag_controller.cc
index ba891a3a235cba3d41da712d617f0e3638c110e8..2e05d26e10b427f970ce7e78b9bf64db78dafd31 100644
--- a/services/ui/ws/drag_controller.cc
+++ b/services/ui/ws/drag_controller.cc
@@ -46,7 +46,7 @@ DragController::DragController(
ServerWindow* source_window,
DragTargetConnection* source_connection,
int32_t drag_pointer,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
+ const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data,
DropEffectBitmask drag_operations)
: source_(source),
cursor_updater_(cursor_updater),
@@ -55,7 +55,7 @@ DragController::DragController(
current_cursor_(ui::mojom::Cursor::NO_DROP),
source_window_(source_window),
source_connection_(source_connection),
- mime_data_(std::move(mime_data)),
+ mime_data_(mime_data),
weak_factory_(this) {
SetCurrentTargetWindow(nullptr);
EnsureWindowObserved(source_window_);
@@ -216,7 +216,7 @@ void DragController::QueueOperation(ServerWindow* window,
DragTargetConnection* connection = source_->GetDragTargetForWindow(window);
if (connection != source_connection_ &&
!base::ContainsKey(called_on_drag_mime_types_, connection)) {
- connection->PerformOnDragDropStart(mime_data_.Clone());
+ connection->PerformOnDragDropStart(mime_data_);
called_on_drag_mime_types_.insert(connection);
}
« no previous file with comments | « services/ui/ws/drag_controller.h ('k') | services/ui/ws/drag_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698