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

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

Issue 2511883006: Mojo C++ bindings: switch services/ui/public/interfaces mojom target to use STL types. (Closed)
Patch Set: . Created 4 years, 1 month 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/test_utils.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/test_utils.cc
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index 23d538ee46aa60bf80b7cba0aba6b9bfe0cb5c20..7b06a88d45a71040e5405c5d14551b234f640a63 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -178,7 +178,7 @@ void TestWindowManager::WmDisplayRemoved(int64_t display_id) {
void TestWindowManager::WmCreateTopLevelWindow(
uint32_t change_id,
ClientSpecificId requesting_client_id,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) {
+ const std::unordered_map<std::string, std::vector<uint8_t>>& properties) {
got_create_top_level_window_ = true;
change_id_ = change_id;
}
@@ -253,7 +253,7 @@ void TestWindowTreeClient::OnWindowBoundsChanged(uint32_t window,
void TestWindowTreeClient::OnClientAreaChanged(
uint32_t window_id,
const gfx::Insets& new_client_area,
- mojo::Array<gfx::Rect> new_additional_client_areas) {}
+ const std::vector<gfx::Rect>& new_additional_client_areas) {}
void TestWindowTreeClient::OnTransientWindowAdded(
uint32_t window_id,
@@ -267,7 +267,7 @@ void TestWindowTreeClient::OnWindowHierarchyChanged(
uint32_t window,
uint32_t old_parent,
uint32_t new_parent,
- mojo::Array<mojom::WindowDataPtr> windows) {
+ std::vector<mojom::WindowDataPtr> windows) {
tracker_.OnWindowHierarchyChanged(window, old_parent, new_parent,
std::move(windows));
}
@@ -300,9 +300,9 @@ void TestWindowTreeClient::OnWindowParentDrawnStateChanged(uint32_t window,
void TestWindowTreeClient::OnWindowSharedPropertyChanged(
uint32_t window,
- const mojo::String& name,
- mojo::Array<uint8_t> new_data) {
- tracker_.OnWindowSharedPropertyChanged(window, name, std::move(new_data));
+ const std::string& name,
+ const base::Optional<std::vector<uint8_t>>& new_data) {
+ tracker_.OnWindowSharedPropertyChanged(window, name, new_data);
}
void TestWindowTreeClient::OnWindowInputEvent(uint32_t event_id,
@@ -335,7 +335,7 @@ void TestWindowTreeClient::OnWindowSurfaceChanged(
float device_scale_factor) {}
void TestWindowTreeClient::OnDragDropStart(
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) {}
+ const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data) {}
void TestWindowTreeClient::OnDragEnter(uint32_t window,
uint32_t key_state,
« no previous file with comments | « services/ui/ws/test_utils.h ('k') | services/ui/ws/window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698