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

Unified Diff: services/ui/ws/window_tree.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_tree.h ('k') | ui/aura/mus/drag_drop_controller_mus.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 a9d098e8e875b8bb58e9885717c5aa61d75b0c71..aa70c3ca5725f55b894fe212048dcbdfa9d959b7 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -11,7 +11,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
-#include "mojo/public/cpp/bindings/stl_converters.h"
+#include "mojo/public/cpp/bindings/map.h"
#include "services/ui/ws/default_access_policy.h"
#include "services/ui/ws/display.h"
#include "services/ui/ws/display_manager.h"
@@ -1645,9 +1645,7 @@ void WindowTree::PerformDragDrop(
// normal.
WindowManagerState* wms = display_root->window_manager_state();
window_server_->StartDragLoop(change_id, window, this);
- wms->SetDragDropSourceWindow(
- this, window, this, mojo::WrapSTLType(mojo::UnorderedMapToMap(drag_data)),
- drag_operation);
+ wms->SetDragDropSourceWindow(this, window, this, drag_data, drag_operation);
}
void WindowTree::CancelDragDrop(Id window_id) {
@@ -1955,9 +1953,8 @@ DragTargetConnection* WindowTree::GetDragTargetForWindow(
}
void WindowTree::PerformOnDragDropStart(
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) {
- client()->OnDragDropStart(
- mojo::MapToUnorderedMap(mojo::UnwrapToSTLType(std::move(mime_data))));
+ const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data) {
+ client()->OnDragDropStart(mime_data);
}
void WindowTree::PerformOnDragEnter(
« no previous file with comments | « services/ui/ws/window_tree.h ('k') | ui/aura/mus/drag_drop_controller_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698