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

services/ui/ws/display.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_WS_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <queue>
 #include <set>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "services/ui/common/types.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
 #include "services/ui/ws/focus_controller_delegate.h"
 #include "services/ui/ws/focus_controller_observer.h"
 #include "services/ui/ws/platform_display.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_observer.h"
 #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 {
 
 class DisplayBinding;
 class DisplayManager;
 class FocusController;
 struct PlatformDisplayInitParams;
 class WindowManagerDisplayRoot;
 class WindowServer;
@@ skipping 27 matching lines @@
   // Initializes state that depends on the existence of a Display.
   void Init(std::unique_ptr<DisplayBinding> binding);
 
   uint32_t id() const { return id_; }
 
   DisplayManager* display_manager();
   const DisplayManager* display_manager() const;
 
   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::WsDisplay for the specified display. WindowManager
+  // specific values are not set.
+  mojom::WsDisplayPtr ToWsDisplay() 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);
 
   // Schedules destruction of surfaces in |window|. If a frame has been
   // scheduled but not drawn surface destruction is delayed until the frame is
   // 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.
   int64_t GetPlatformDisplayId() const;
 
   WindowServer* window_server() { return window_server_; }
 
   // Returns the root of the Display. The root's children are the roots
   // of the corresponding WindowManagers.
   ServerWindow* root_window() { return root_.get(); }
@@ skipping 118 matching lines @@
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_