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

services/ui/public/interfaces/window_manager_constants.mojom

 // 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.
 
 module ui.mojom;
 
+import "services/ui/public/interfaces/display/display.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 
 enum WindowManagerErrorCode {
   SUCCESS,
   ACCESS_DENIED
 };
 
 // TODO(sky): seems like this should not be defined in mus, rather in mash.
 // Only thing mus cares about is minimized and that should be expressed
 // differently.
 enum ShowState {
   DEFAULT,
   NORMAL,
   MINIMIZED,
   MAXIMIZED,
   INACTIVE,
   FULLSCREEN,
   DOCKED,
 };
 
-enum Rotation {
-  VALUE_0,
-  VALUE_90,
-  VALUE_180,
-  VALUE_270,
-};
-
 const int32 kResizeBehaviorNone = 0;
 const int32 kResizeBehaviorCanResize = 1;
 const int32 kResizeBehaviorCanMaximize = 2;
 const int32 kResizeBehaviorCanMinimize = 4;
 
 struct FrameDecorationValues {
   gfx.mojom.Insets normal_client_area_insets;
   gfx.mojom.Insets maximized_client_area_insets;
   // Max width needed to display the buttons on the title bar. The buttons are
   // aligned to the trailing edge of the titlebar.
   // TODO(sky): this API is very narrow, and assumes a particular config.
   uint32 max_title_bar_button_width;
 };
 
-enum TouchSupport {
-  UNKNOWN,
-  AVAILABLE,
-  UNAVAILABLE,
-};
-
-struct Display {
-  int64 id;
-  gfx.mojom.Rect bounds;
-  gfx.mojom.Rect work_area;
-  float device_pixel_ratio;
-  Rotation rotation;
-  TouchSupport touch_support;
+struct WmDisplay {

[sky, 2016/07/19 18:07:15]

This names implies the display is for or from the windowmanager, which isn't
quite right. WDYT of WsDisplay, as in Window Server Display?

[kylechar, 2016/07/19 18:55:20]

WsDisplay it is.

+  display.mojom.Display display;
   bool is_primary;
   FrameDecorationValues frame_decoration_values;
 };
 
 // Whether a client initiated move loop was started with a mouse event or a
 // touch event.
 enum MoveLoopSource {
   MOUSE,
   TOUCH
 };
 
 enum WindowType {
   // These constants come from Widget::InitParams. See it for details.
   // TODO: see if we can reduce this set. For example, why do we need both
   // BUBBLE and POPUP.
   WINDOW,
   PANEL,
   WINDOW_FRAMELESS,
   CONTROL,
   POPUP,
   MENU,
   TOOLTIP,
   BUBBLE,
   DRAG,
 };