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

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

Issue 2161993002: Start using display.mojom.Display in mus+ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@display_traits
Patch Set: Fixes. Created 4 years, 5 months 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/window_server_delegate.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 36ed00f62f23c38752fa0ac13afbaf2e6e9a5839..8fed30133c4c9821432b03aec54bee377b71c486 100644
--- a/services/ui/ws/user_display_manager_unittest.cc
+++ b/services/ui/ws/user_display_manager_unittest.cc
@@ -55,21 +55,21 @@ class TestDisplayManagerObserver : public mojom::DisplayManagerObserver {
}
std::string DisplayIdsToString(
- const mojo::Array<mojom::DisplayPtr>& displays) {
+ const mojo::Array<mojom::WsDisplayPtr>& wm_displays) {
std::string display_ids;
- for (const auto& display : displays) {
+ for (const auto& wm_display : wm_displays) {
if (!display_ids.empty())
display_ids += " ";
- display_ids += base::Int64ToString(display->id);
+ display_ids += base::Int64ToString(wm_display->display.id());
}
return display_ids;
}
// mojom::DisplayManagerObserver:
- void OnDisplays(mojo::Array<mojom::DisplayPtr> displays) override {
+ void OnDisplays(mojo::Array<mojom::WsDisplayPtr> displays) override {
AddCall("OnDisplays " + DisplayIdsToString(displays));
}
- void OnDisplaysChanged(mojo::Array<mojom::DisplayPtr> displays) override {
+ void OnDisplaysChanged(mojo::Array<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/window_server_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698