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

services/ui/ws/platform_display.h

 // Copyright 2014 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_PLATFORM_DISPLAY_H_
 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
+#include <utility>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/frame_generator.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/platform_display_delegate.h"
+#include "ui/display/display.h"
 #include "ui/platform_window/platform_window_delegate.h"
 
 namespace cc {
 class CopyOutputRequest;
 }  // namespace cc
 
 namespace gfx {
 class Rect;
 }
 
@@ skipping 30 matching lines @@
   virtual void SetViewportSize(const gfx::Size& size) = 0;
 
   virtual void SetTitle(const base::string16& title) = 0;
 
   virtual void SetCapture() = 0;
 
   virtual void ReleaseCapture() = 0;
 
   virtual void SetCursorById(int32_t cursor) = 0;
 
-  virtual mojom::Rotation GetRotation() = 0;
+  virtual ::display::Display::Rotation GetRotation() = 0;
 
   virtual float GetDeviceScaleFactor() = 0;
 
   virtual void UpdateTextInputState(const ui::TextInputState& state) = 0;
   virtual void SetImeVisibility(bool visible) = 0;
 
   // Returns true if a compositor frame has been submitted but not drawn yet.
   virtual bool IsFramePending() const = 0;
 
   virtual void RequestCopyOfOutput(
@@ skipping 24 matching lines @@
   // PlatformDisplay:
   void Init(PlatformDisplayDelegate* delegate) override;
   void SchedulePaint(const ServerWindow* window,
                      const gfx::Rect& bounds) override;
   void SetViewportSize(const gfx::Size& size) override;
   void SetTitle(const base::string16& title) override;
   void SetCapture() override;
   void ReleaseCapture() override;
   void SetCursorById(int32_t cursor) override;
   float GetDeviceScaleFactor() override;
-  mojom::Rotation GetRotation() override;
+  ::display::Display::Rotation GetRotation() override;
   void UpdateTextInputState(const ui::TextInputState& state) override;
   void SetImeVisibility(bool visible) override;
   bool IsFramePending() const override;
   void RequestCopyOfOutput(
       std::unique_ptr<cc::CopyOutputRequest> output_request) override;
   int64_t GetDisplayId() const override;
 
  private:
   void UpdateMetrics(const gfx::Size& size, float device_scale_factor);
 
@@ skipping 29 matching lines @@
   std::unique_ptr<ui::PlatformWindow> platform_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_PLATFORM_DISPLAY_H_