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

Unified Diff: services/ui/public/cpp/tests/test_window_tree.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 | « mojo/public/cpp/bindings/map.h ('k') | services/ui/public/cpp/tests/test_window_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/tests/test_window_tree.h
diff --git a/services/ui/public/cpp/tests/test_window_tree.h b/services/ui/public/cpp/tests/test_window_tree.h
index c43e915de4859cc464328c7163cd7679b64dea59..f10fbc2c374769509fe716eda3a68c65ec876e96 100644
--- a/services/ui/public/cpp/tests/test_window_tree.h
+++ b/services/ui/public/cpp/tests/test_window_tree.h
@@ -31,31 +31,35 @@ class TestWindowTree : public mojom::WindowTree {
private:
// mojom::WindowTree:
- void NewWindow(
- uint32_t change_id,
- uint32_t window_id,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
+ void NewWindow(uint32_t change_id,
+ uint32_t window_id,
+ const base::Optional<
+ std::unordered_map<std::string, std::vector<uint8_t>>>&
+ properties) override;
void NewTopLevelWindow(
uint32_t change_id,
uint32_t window_id,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> properties) override;
+ const std::unordered_map<std::string, std::vector<uint8_t>>& properties)
+ override;
void DeleteWindow(uint32_t change_id, uint32_t window_id) override;
void SetWindowBounds(uint32_t change_id,
uint32_t window_id,
const gfx::Rect& bounds) override;
void SetClientArea(uint32_t window_id,
const gfx::Insets& insets,
- mojo::Array<gfx::Rect> additional_client_areas) override;
+ const base::Optional<std::vector<gfx::Rect>>&
+ additional_client_areas) override;
void SetHitTestMask(uint32_t window_id,
const base::Optional<gfx::Rect>& mask) override;
void SetCanAcceptDrops(uint32_t window_id, bool accepts_drags) override;
void SetWindowVisibility(uint32_t change_id,
uint32_t window_id,
bool visible) override;
- void SetWindowProperty(uint32_t change_id,
- uint32_t window_id,
- const mojo::String& name,
- mojo::Array<uint8_t> value) override;
+ void SetWindowProperty(
+ uint32_t change_id,
+ uint32_t window_id,
+ const std::string& name,
+ const base::Optional<std::vector<uint8_t>>& value) override;
void SetWindowOpacity(uint32_t change_id,
uint32_t window_id,
float opacity) override;
@@ -104,10 +108,11 @@ class TestWindowTree : public mojom::WindowTree {
override;
void GetCursorLocationMemory(const GetCursorLocationMemoryCallback& callback)
override;
- void PerformDragDrop(uint32_t change_id,
- uint32_t source_window_id,
- mojo::Map<mojo::String, mojo::Array<uint8_t>> drag_data,
- uint32_t drag_operation) override;
+ void PerformDragDrop(
+ uint32_t change_id,
+ uint32_t source_window_id,
+ const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
+ uint32_t drag_operation) override;
void CancelDragDrop(uint32_t window_id) override;
void PerformWindowMove(uint32_t change_id,
uint32_t window_id,
« no previous file with comments | « mojo/public/cpp/bindings/map.h ('k') | services/ui/public/cpp/tests/test_window_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698