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

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

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_change_tracker.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/test_utils.h
diff --git a/services/ui/ws/test_utils.h b/services/ui/ws/test_utils.h
index 2a7fcad8114214bf9ca5c810e79f3038b9a1ae54..5013d721989b01b1f732f0de09aad167f820b3bf 100644
--- a/services/ui/ws/test_utils.h
+++ b/services/ui/ws/test_utils.h
@@ -315,14 +315,16 @@ class TestWindowManager : public mojom::WindowManager {
void WmSetBounds(uint32_t change_id,
uint32_t window_id,
const gfx::Rect& bounds) override {}
- void WmSetProperty(uint32_t change_id,
- uint32_t window_id,
- const mojo::String& name,
- mojo::Array<uint8_t> value) override {}
+ void WmSetProperty(
+ uint32_t change_id,
+ uint32_t window_id,
+ const std::string& name,
+ const base::Optional<std::vector<uint8_t>>& value) override {}
void WmCreateTopLevelWindow(
uint32_t change_id,
ClientSpecificId requesting_client_id,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
+ const std::unordered_map<std::string, std::vector<uint8_t>>& properties)
+ override;
void WmClientJankinessChanged(ClientSpecificId client_id,
bool janky) override;
void WmPerformMoveLoop(uint32_t change_id,
@@ -386,7 +388,7 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
void OnClientAreaChanged(
uint32_t window_id,
const gfx::Insets& new_client_area,
- mojo::Array<gfx::Rect> new_additional_client_areas) override;
+ const std::vector<gfx::Rect>& new_additional_client_areas) override;
void OnTransientWindowAdded(uint32_t window_id,
uint32_t transient_window_id) override;
void OnTransientWindowRemoved(uint32_t window_id,
@@ -395,7 +397,7 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
uint32_t window,
uint32_t old_parent,
uint32_t new_parent,
- mojo::Array<mojom::WindowDataPtr> windows) override;
+ std::vector<mojom::WindowDataPtr> windows) override;
void OnWindowReordered(uint32_t window_id,
uint32_t relative_window_id,
mojom::OrderDirection direction) override;
@@ -405,9 +407,10 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
float old_opacity,
float new_opacity) override;
void OnWindowParentDrawnStateChanged(uint32_t window, bool drawn) override;
- void OnWindowSharedPropertyChanged(uint32_t window,
- const mojo::String& name,
- mojo::Array<uint8_t> new_data) override;
+ void OnWindowSharedPropertyChanged(
+ uint32_t window,
+ const std::string& name,
+ const base::Optional<std::vector<uint8_t>>& new_data) override;
void OnWindowInputEvent(uint32_t event_id,
uint32_t window,
std::unique_ptr<ui::Event> event,
@@ -422,7 +425,8 @@ class TestWindowTreeClient : public ui::mojom::WindowTreeClient {
const gfx::Size& frame_size,
float device_scale_factor) override;
void OnDragDropStart(
- mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) override;
+ const std::unordered_map<std::string, std::vector<uint8_t>>& mime_data)
+ override;
void OnDragEnter(uint32_t window,
uint32_t key_state,
const gfx::Point& position,
« no previous file with comments | « services/ui/ws/test_change_tracker.cc ('k') | services/ui/ws/test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698