Moves EventDispatcher from Display to WindowManagerState

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 b6d81f7738e936d4ac37fdbdf7f124668051f747..fe3bc956e983c94ec57e83d1f058c0e2e53803c7 100644
--- a/components/mus/ws/connection_manager.h
+++ b/components/mus/ws/connection_manager.h
@@ -40,9 +40,6 @@ class WindowTreeBinding;
 
 // ConnectionManager manages the set of connections to the window server (all
 // the WindowTrees) as well as providing the root of the hierarchy.
-//
-// TODO(sky): this class is doing too much. Refactor to make responsibilities
-// clearer.
 class ConnectionManager : public ServerWindowDelegate,
                           public ServerWindowObserver,
                           public DisplayManagerDelegate {
@@ -54,6 +51,7 @@ class ConnectionManager : public ServerWindowDelegate,
   ConnectionManagerDelegate* delegate() { return delegate_; }
 
   UserIdTracker* user_id_tracker() { return &user_id_tracker_; }
+  const UserIdTracker* user_id_tracker() const { return &user_id_tracker_; }
 
   DisplayManager* display_manager() { return display_manager_.get(); }
   const DisplayManager* display_manager() const {
@@ -256,7 +254,6 @@ class ConnectionManager : public ServerWindowDelegate,
                                 ServerWindow* transient_child) override;
 
   // DisplayManagerDelegate:
-  void OnWillDestroyDisplay(Display* display) override;
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;