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

Unified Diff: services/ui/ws/drag_controller.h

Issue 2603893002: Remove mojo::Map. (Closed)
Patch Set: Created 4 years 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.cc ('k') | services/ui/ws/drag_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/drag_controller.h
diff --git a/services/ui/ws/drag_controller.h b/services/ui/ws/drag_controller.h
index dd2b292d5254cc7e6cd14bda8043c89429b1b47a..25f06505da3bbd8a0a4fa01de7bcfafaa016f549 100644
--- a/services/ui/ws/drag_controller.h
+++ b/services/ui/ws/drag_controller.h
@@ -37,13 +37,14 @@ using DropEffectBitmask = uint32_t;
// WindowManagerState's EventDispatcher creates and owns this instance.
class DragController : public ServerWindowObserver {
public:
- DragController(DragCursorUpdater* cursor_updater,
- DragSource* source,
- ServerWindow* source_window,
- DragTargetConnection* source_connection,
- int32_t drag_pointer,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data,
- DropEffectBitmask drag_operations);
+ DragController(
+ DragCursorUpdater* cursor_updater,
+ DragSource* source,
+ ServerWindow* source_window,
+ DragTargetConnection* source_connection,
+ int32_t drag_pointer,
+ std::unordered_map<std::string, std::vector<uint8_t>> mime_data,
yzshen1 2017/01/03 19:07:48 Does it make sense to make this const&? It is not
Sam McNally 2017/01/03 23:24:03 Done.
+ DropEffectBitmask drag_operations);
~DragController() override;
ui::mojom::Cursor current_cursor() const { return current_cursor_; }
@@ -130,7 +131,7 @@ class DragController : public ServerWindowObserver {
DragTargetConnection* source_connection_;
// A list of the offered mime types.
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data_;
+ std::unordered_map<std::string, std::vector<uint8_t>> mime_data_;
// We need to keep track of state on a per window basis. A window being in
// this map means that we're observing it. WindowState also keeps track of
« no previous file with comments | « services/ui/public/cpp/window_tree_client.cc ('k') | services/ui/ws/drag_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698