Moves FrameDecorations from Display to WindowManagerState

components/mus/ws/window_manager_state.h

Index: components/mus/ws/window_manager_state.h
diff --git a/components/mus/ws/window_manager_state.h b/components/mus/ws/window_manager_state.h
index adc30c10959cfcd3a00935d805c950811863489e..c0fe99aaf8b8fa996083457c42a680728f0194d7 100644
--- a/components/mus/ws/window_manager_state.h
+++ b/components/mus/ws/window_manager_state.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include "base/memory/scoped_ptr.h"
+#include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/ws/user_id.h"
 
 namespace mus {
@@ -34,6 +35,21 @@ class WindowManagerState {
   WindowTree* tree() { return tree_; }
   const WindowTree* tree() const { return tree_; }
 
+  Display* display() { return display_; }
+  const Display* display() const { return display_; }
+
+  void SetFrameDecorationValues(mojom::FrameDecorationValuesPtr values);
+  const mojom::FrameDecorationValues& frame_decoration_values() const {
+    return *frame_decoration_values_;
+  }
+  bool got_frame_decoration_values() const {
+    return got_frame_decoration_values_;
+  }
+
+  // Returns a mojom::Display for the specified display. WindowManager specific
+  // values are not set.
+  mojom::DisplayPtr ToMojomDisplay() const;
+
  private:
   friend class Display;
 
@@ -49,6 +65,10 @@ class WindowManagerState {
   scoped_ptr<ServerWindow> root_;
   WindowTree* tree_ = nullptr;
 
+  // Set to true the first time SetFrameDecorationValues() is received.
+  bool got_frame_decoration_values_ = false;
+  mojom::FrameDecorationValuesPtr frame_decoration_values_;
+
   DISALLOW_COPY_AND_ASSIGN(WindowManagerState);
 };