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

services/ui/ws/display.h

Index: services/ui/ws/display.h
diff --git a/services/ui/ws/display.h b/services/ui/ws/display.h
index aaca1cf700c01d535709362eb7900cd739d209fd..a03611830f394deab9df6c19b334b723f74a5539 100644
--- a/services/ui/ws/display.h
+++ b/services/ui/ws/display.h
@@ -25,6 +25,7 @@
 #include "services/ui/ws/server_window_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set_observer.h"
+#include "ui/display/display.h"
 
 namespace ui {
 namespace ws {
@@ -72,9 +73,12 @@ class Display : public PlatformDisplayDelegate,
 
   PlatformDisplay* platform_display() { return platform_display_.get(); }
 
-  // Returns a mojom::Display for the specified display. WindowManager specific
-  // values are not set.
-  mojom::DisplayPtr ToMojomDisplay() const;
+  // Returns a mojom::WmDisplay for the specified display. WindowManager
+  // specific values are not set.
+  mojom::WmDisplayPtr ToWmDisplay() const;
+
+  // Returns a display::Display for the specficied display.
+  ::display::Display ToDisplay() const;
 
   // Schedules a paint for the specified region in the coordinates of |window|.
   void SchedulePaint(const ServerWindow* window, const gfx::Rect& bounds);
@@ -84,7 +88,7 @@ class Display : public PlatformDisplayDelegate,
   // drawn, otherwise destruction is immediate.
   void ScheduleSurfaceDestruction(ServerWindow* window);
 
-  mojom::Rotation GetRotation() const;
+  ::display::Display::Rotation GetRotation() const;
   gfx::Size GetSize() const;
 
   // Returns the id for the corresponding id.