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

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

Issue 2505133003: Mojo C++ bindings: switch part of the services/ui/public/interfaces mojom target to use STL types. (Closed)
Patch Set: Merge branch 'master' into c139_wrappers_ui 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/user_display_manager.cc ('k') | services/ui/ws/user_id_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/user_display_manager_unittest.cc
diff --git a/services/ui/ws/user_display_manager_unittest.cc b/services/ui/ws/user_display_manager_unittest.cc
index 1380e9f9bdee720e216bc06dcb63a41d99fccb8f..8d0549f57a13b4169155e3f5f09475cc0dd466b9 100644
--- a/services/ui/ws/user_display_manager_unittest.cc
+++ b/services/ui/ws/user_display_manager_unittest.cc
@@ -72,7 +72,7 @@ class TestDisplayManagerObserver : public mojom::DisplayManagerObserver {
}
std::string DisplayIdsToString(
- const mojo::Array<mojom::WsDisplayPtr>& wm_displays) {
+ const std::vector<mojom::WsDisplayPtr>& wm_displays) {
std::string display_ids;
for (const auto& wm_display : wm_displays) {
if (!display_ids.empty())
@@ -83,12 +83,12 @@ class TestDisplayManagerObserver : public mojom::DisplayManagerObserver {
}
// mojom::DisplayManagerObserver:
- void OnDisplays(mojo::Array<mojom::WsDisplayPtr> displays,
+ void OnDisplays(std::vector<mojom::WsDisplayPtr> displays,
int64_t primary_display_id,
int64_t internal_display_id) override {
AddCall("OnDisplays " + DisplayIdsToString(displays));
}
- void OnDisplaysChanged(mojo::Array<mojom::WsDisplayPtr> displays) override {
+ void OnDisplaysChanged(std::vector<mojom::WsDisplayPtr> displays) override {
AddCall("OnDisplaysChanged " + DisplayIdsToString(displays));
}
void OnDisplayRemoved(int64_t id) override {
« no previous file with comments | « services/ui/ws/user_display_manager.cc ('k') | services/ui/ws/user_id_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698