Start using display.mojom.Display in mus+ash.

services/ui/ws/user_display_manager.cc

Index: services/ui/ws/user_display_manager.cc
diff --git a/services/ui/ws/user_display_manager.cc b/services/ui/ws/user_display_manager.cc
index 9c328e6ef13e81f0a0377c5216e228a4f9794080..3bb3fb1f3d8d79d759edffd4168cb850e350591e 100644
--- a/services/ui/ws/user_display_manager.cc
+++ b/services/ui/ws/user_display_manager.cc
@@ -4,6 +4,8 @@
 
 #include "services/ui/ws/user_display_manager.h"
 
+#include <utility>
+
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/display_manager.h"
 #include "services/ui/ws/display_manager_delegate.h"
@@ -33,7 +35,7 @@ void UserDisplayManager::OnFrameDecorationValuesChanged() {
     return;
   }
 
-  mojo::Array<mojom::DisplayPtr> displays = GetAllDisplays();
+  mojo::Array<mojom::WmDisplayPtr> displays = GetAllDisplays();
   display_manager_observers_.ForAllPtrs(
       [this, &displays](mojom::DisplayManagerObserver* observer) {
         observer->OnDisplaysChanged(displays.Clone());
@@ -73,8 +75,8 @@ void UserDisplayManager::OnDisplayUpdate(Display* display) {
   if (!got_valid_frame_decorations_)
     return;
 
-  mojo::Array<mojom::DisplayPtr> displays(1);
-  displays[0] = display->ToMojomDisplay();
+  mojo::Array<mojom::WmDisplayPtr> displays(1);
+  displays[0] = display->ToWmDisplay();
   delegate_->GetFrameDecorationsForUser(
       user_id_, &(displays[0]->frame_decoration_values));
   display_manager_observers_.ForAllPtrs(
@@ -119,14 +121,14 @@ void UserDisplayManager::OnObserverAdded(
   CallOnDisplays(observer);
 }
 
-mojo::Array<mojom::DisplayPtr> UserDisplayManager::GetAllDisplays() {
+mojo::Array<mojom::WmDisplayPtr> UserDisplayManager::GetAllDisplays() {
   const std::set<Display*>& displays = display_manager_->displays();
-  mojo::Array<mojom::DisplayPtr> display_ptrs(displays.size());
+  mojo::Array<mojom::WmDisplayPtr> display_ptrs(displays.size());
   {
     size_t i = 0;
     // TODO(sky): need ordering!
     for (Display* display : displays) {
-      display_ptrs[i] = display->ToMojomDisplay();
+      display_ptrs[i] = display->ToWmDisplay();
       delegate_->GetFrameDecorationsForUser(
           user_id_, &(display_ptrs[i]->frame_decoration_values));
       ++i;