Index: services/ui/public/interfaces/window_manager_constants.mojom |
diff --git a/services/ui/public/interfaces/window_manager_constants.mojom b/services/ui/public/interfaces/window_manager_constants.mojom |
index 650124815196fe03bfedd4667a95b46c971fc70e..1a92019a10246b45d463a3d5e4f42dfdc3401a96 100644 |
--- a/services/ui/public/interfaces/window_manager_constants.mojom |
+++ b/services/ui/public/interfaces/window_manager_constants.mojom |
@@ -4,6 +4,7 @@ |
module ui.mojom; |
+import "services/ui/public/interfaces/display/display.mojom"; |
import "ui/gfx/geometry/mojo/geometry.mojom"; |
enum WindowManagerErrorCode { |
@@ -24,13 +25,6 @@ enum ShowState { |
DOCKED, |
}; |
-enum Rotation { |
- VALUE_0, |
- VALUE_90, |
- VALUE_180, |
- VALUE_270, |
-}; |
- |
const int32 kResizeBehaviorNone = 0; |
const int32 kResizeBehaviorCanResize = 1; |
const int32 kResizeBehaviorCanMaximize = 2; |
@@ -45,19 +39,8 @@ struct FrameDecorationValues { |
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
kylechar
2016/07/19 18:55:20
WsDisplay it is.
|
+ display.mojom.Display display; |
bool is_primary; |
FrameDecorationValues frame_decoration_values; |
}; |