Renames WindowManagerConfig to FrameDecorationValues and moves to Display

components/mus/ws/connection_manager.h

Index: components/mus/ws/connection_manager.h
diff --git a/components/mus/ws/connection_manager.h b/components/mus/ws/connection_manager.h
index 922ac5f637abb18bdb8a95484100cd967c6bee88..3e1ba7fc232af1c7991d7c6090e9db60685f7a0c 100644
--- a/components/mus/ws/connection_manager.h
+++ b/components/mus/ws/connection_manager.h
@@ -176,6 +176,7 @@ class ConnectionManager : public ServerWindowDelegate,
   void ProcessWindowDeleted(const ServerWindow* window);
   void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
                                                int32_t cursor_id);
+  void ProcessFrameDecorationValuesChanged(WindowTreeHostImpl* host);
 
  private:
   friend class Operation;
@@ -226,6 +227,16 @@ class ConnectionManager : public ServerWindowDelegate,
   // Run in response to events which may cause us to change the native cursor.
   void MaybeUpdateNativeCursor(ServerWindow* window);
 
+  // Calls OnDisplays() on |observer|.
+  void CallOnDisplays(mojom::DisplayManagerObserver* observer);
+
+  // Calls observer->OnDisplaysChanged() with the display for |host|.
+  void CallOnDisplayChanged(mojom::DisplayManagerObserver* observer,
+                            WindowTreeHostImpl* host);
+
+  // Returns the Display for |host|.
+  mojom::DisplayPtr DisplayForHost(WindowTreeHostImpl* host);
+
   // Overridden from ServerWindowDelegate:
   mus::SurfacesState* GetSurfacesState() override;
   void OnScheduleWindowPaint(const ServerWindow* window) override;
@@ -298,9 +309,13 @@ class ConnectionManager : public ServerWindowDelegate,
   uint32_t next_wm_change_id_;
 
   mojo::WeakBindingSet<mojom::DisplayManager> display_manager_bindings_;
+  // WARNING: only use these once |got_valid_frame_decorations_| is true.
+  // TODO(sky): refactor this out into its own class.
   mojo::WeakInterfacePtrSet<mojom::DisplayManagerObserver>
       display_manager_observers_;
 
+  bool got_valid_frame_decorations_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };